(#1509) - Ensure ajax only completes once
(#1624) - Make sure cancel changes test doesnt end prematurely