Testing cleanup of dispatch and more catalog building work.