Slight refactoring, I think it makes more sense this way around
changing tests around