Fixed tests to work with mocks and factorygirl