Add factory girl

Converts tests to use factory girl
Remove this line.