Track instances separately from views; more tests; etc.