refactoring module data
added module tests