Some tests, and managed to tease out some simplifications