Test for defect #2561 "import of changed entity into empty cache preserves originalValues"
Two tests that failed for #2560 and #2561 marked "fixed"