Applying Scott Bassin's patch from LANG-371, adding unit tests that follow the approach of his previous patch to the documentation