DRY up step definitions