Changed scenario name
Refactored client step definitions