Simplify API

Oh... We don't have tests for catalog validations...