Moving things around to keep things sensible
Corrected version tests