Starting fix of test suite