Merge pull request #9468 from mpickering/wip/unit-tests