bugfixes on cucumber tests