Add sugar to add_step, overload +, and code coverage