Fixes for failing cucumber tests

Fixes for failing cucumber tests