Add some simpler validation. Fix test cat names