Improve test coverage and testing harness

:bomb: