testing
fixes
WIP simplifications
adds coverage