All tests fixed