added users, more testing, factory_girl