Add cucumber and update tests.