fix failures of some more tests
fix failures of some more tests