Updated user-tests