refactoring and more otec tests
fix to test harness
Milestone Commit (This commit hugs trees): performance fix (revisions now sync efficiently), and fix to history reconstitution on replays when ops have conflicts (we assume that conflicts have already been resolved and bypass the transform logic in these cases)