test
Fixed Testing, close #7
Refactored Modules, close #8