Removed a bunch of unit tests and created an integration test.  I do need to create more tests though.