Added tests for modules, and cleaned up some files