Fixes for cucumber tests.