Update tests to work with ENV=cucumber