Merge "Remove Most of dx-tests"