Fixed unittests