Fixed unittests
fixed unittests