cleanup
small fix in tests
small fix
prepare modules versions
#1274
small fix in comments