Cleaning up CS, removing last quirks from the test suite

Major cleanups for the test suite in preparation for 0.8