Merge "Fix omx_tests to no longer refer to test files that are no longer available."