Improve user tests