Put catalog spec tests in spec/catalog/class
Add a terminus for reports