Clean up tests

[martinberoiz]

Tests have too much repeated code that could probably be put into a convenience function. Especially code to generate an example catalogs.