use for/else instead of while
use wait_until for call_steps assertions
reorder step definitions in given-when-then order