fixes for unittests