Moved around tests further in an attempt to make them easier to run...