More class test cases and add module test case.