switching to factory_girl. Tests don't quite work yet