Add cucumber and cuc tests