Fix rails 4 breakage
Rearrange tests