lots of new test code