Fix Cucumber tests #17

Work in progress...
All help is welcome