Quick fix for unittests not building (needs some rework)