fix ALL the tests