Added missing module test
Removed unused modules
Updated