All tests fixed, and some more added.