trying to fix the testsystem issues