Improved unittests.