Refactored Module Type test cases by category and removed all checkstyle
warnings.