implemented Factory Girl, refactored tests