Rework tests, hack to run Cucumber without RVM, all tests pass