user tests fixes