Remove various blocking issues
fix unit test failures