Improved test unit