Adjusted some step definitions