did some more fun work
add factory girl and fix all tests