Cleaned up the tests.  Need to get this in order before the big caching story.