improved unittests