fix remarks
add unittests for ModulesTool
cleanup environment