part of the tests fixed