Improve next impl -- needs refactoring
Simplify temp breakpoint cleanup
Cleanup test