Minor schema fixes
Added a test for the enum constraints in schema