catalog: improved tests.