Schema: Wrote a test to ensure schema is up to date
Merge pull request #2480 from daviddavis/temp/1371044147

Schema: Wrote a test to ensure schema is up to date