Extend ODP and tag-matching tests
4 files changed