with new modules and test file