Merge "Make copyTestData work on postgres"