Fixing user tests