Improve cucumber executable handling