fixed 2/5 of the tests