unittests fixed