Fix broken tests that resulted from schema changes