Improved unit testing

...as a consequence of the improved build-check system