Added additional clean-up calls to the unit tests.