Improve some more tests.