fixed tests; removed broken cucumber;