WIP: cleanup PR
Compound test for last-run-only