MT#7319 try to fix the tests. part II

some of concurrent_max_* tests are still broken, needs more investigation.