Fixed failing unit tests in Database1_9_7UpgradeTest