Refactor tests to use dummy catalog.