Fix bug in cmp. CMP tests now pass for all configurations.