[WIP] Unit Test Improvements

As per my understanding we don't need these commented lines. I am unsure what this cleanup stuff is doing here as we are doing cleanup in ModuleStoreTestCase.