Tidy up a bit and remove some old tests.