JBehave improved