Fixed for integration with hydra-head, and upgraded tests to FactoryGirl.create refs #52