All sorts of changes to get tests working with latest code of "changes" page.