Merge "Make deprecated TestUser properties private"