Fix failing unit tests under new catbox