incremental tests and tidy up