Merge "Remove uses of deprecated TestUser properties"