refactor using FACTORIES
refactor test
update
refactor tests
cleared old spec/factories
bad merging