much improved unittests