fixing and adding test files
Merge branch 'master' of https://github.com/fresheneesz/buildModules