adapt unittests to new format