Can we just uppercase the userId instead of adding `Aa`? Also, aren't `userId` and `generateTestUserId` actually misleading as they aren't really generating a user id?