Simple fix for the unittests for the moment