Fix some stepping tests