Fixed up many unit test failures in doc-view-research branch