Moving removeBundles to BaseTestClass.