More fixes for cucumber to allow it to run with 'lein cucumber' and
'lein test'.