Expands cukes out to cover complete required features