Refactored to remove test#XXX methods from ModuleStoreTestCase