Removed ModulesTest
Fix tests