Improved unit-tests