Revert previous 'improvement'
Better tests (pretend got better since 0.5, thank you so much Google!)