another try to fix the unittests