fixing tests (all test failure because of errors during merge)