Fixed failing tests with cucumber