added model relations and factorygirl test data