Fix for unittests