Unittests fixed!