Clean up and simplify tests for TestModuleForModel