Added some more tests and fixed a few resulting arg validation errors.  Also cleaned up a bit more of the object model.