Fixing FunctionalTestCase1 for the new schema