New days new trying to fix unittests