Ah nevermind, I see that you're switching between mocks and factorygirl depending on the context... so it's probably less confusing to leave it the way you have.