Add more tests for catalog validation
Fold long lines
Validate relations of ring and farms correctly
Test validation of relations of farm and ring