Work in progress on getting test coverage up to scratch
Completed test coverage (though neither PITest nor JaCoCo can understand it is complete...)