(#1624) - Make sure cancel changes test doesnt end prematurely