commit with all the tests corrected