Disable new_x support for now.
Reorganize test suite.