Code cleanup
Added a test for the Module class