Revised cucumber testing for merge -- now includes comment capability