Made updates to roundtrip code to conform to cypress 2.5 expectations