Move step invoke tests.
Change matching_step to comma ok idom
Update todo list