Cucumber training start

Various little fixes