refactored Factory girl with relationships