Added more coverage of user tests