Merge "Finish refactoring tests to NATIVE_TESTS"