Cleanup; compound test for last-run-only