6e52d15cc1
In addition, fix up some tests to simplify future maintenance of the build and add a few more comments to explain what I investigated.