(bug 62210) Avoid EntityContent::save in lib tests

Change-Id: Id09c77400bb25eedae45ed59c4ec41dfc4c0cf1e
Merge "(bug 62210) Avoid EntityContent::save in lib tests"