fixed unittests to comply with Compmake's new behavior