Committing changes made to unit tests.  All tests are currently passing.