Use new utility and error helpers.
Added more replicator tests.