Complete suite of tests on stepping
Fix bugs in stepping