Fixing of jbehave components --partial