Add merge to workspace to make consistent with an entity manager.
Refactor workspace tests to be txn free.