Merge "Update dx tests and test runner scripts"