Few more stepping tests
Code readability tweak