Fixed problems with merge that were breaking unit tests.