Some tests, and managed to tease out some simplifications
Some tests, and managed to tease out some simplifications
Simplification of API and unit tests