(#1507) Fix changes test fire-complete-on-cancel

Wait for DB setup to complete before starting changes.

This avoids the buggy code rather than fixing it.

A separate test that delays database setup until after changes is called would test the buggy code reliably, but I don't know how to write that.