Feature/comparison cukes

Fixes `#2336`