Added custom_step, and equivalence tests