fix cukes and resolve deprecations