Cleanup of unit tests
Unit test clean-up