Merge "Modify Unit test for module definition"