Fix and enable some more tests
5 files changed