Someone broke a whole bunch of tests by changing a schema.  Fixed the tests.  Also: Semicolon Police.