Convert counters to ref, remove legacy importers
Add new test files; adjust tests to use them