Merge "Add tests for User::getCanonicalName()"