(#1458) - Fire complete callback when changes are cancelled
(#1438) - Wait for changes complete call to finish tests