Fixing more tests for DatabaseTestCase change.