70067bc9bf
The previous one didn't work in 191. Also revert changes in tests-common module.
The previous one didn't work in 191. Also revert changes in tests-common module.