This is mainly done to be able to push to 11.0
The test is moved in 10.6 to another file, which will add back the test.