Add more user tests