rewrite syntax of FactoryGirl
get unit tests working
ALL TESTS PASS fixes #13