More work on the tests, all but slow ones passing.