fix test compilation/run with somewhat different test code locations in 1.11
another merge error