Gid combat test fixes

after merge: deploy on test-env.