Clean up stepping func a bit

Allow tests to pass custom event object
Begin to add tests for directive stepping functionality