Unittests cleanup