Disable the test stuff
Upstream merge