Merge "Remove leading underscore in _create_test_user"