r19602@catbus: nickm | 2008-05-05 11:45:18 -0400 Make most of the tests use the new headers. svn:r776