added new modules and tests