Merge "Update OWNERS files for tests"