Rework watch/unwatch test helpers
Rework Fixture -> FixtureFunc. Add Fixture and Cases.