Fix failing behave tests