Fixed regular cuke test suite; hid touch test temp'ly