Fix for broken unittests