Cucumber Tests: Fixing Tests
Cucumber Tests: TEAM-203