remove run.next usage, it is now extraneous

- cleanup complicated tests that made this refactor easy