Refactor behave tests