Improved user.tests