Stubbed out tests.  I think I have to rethink how I'm going to handle the objects containing data and how to merge these.