fix to all the tests