refactor tests, and simplify autosave predicate resolution