Added single job scenario and refactored step definitions