Fix a unit test quirk. Improve phpdoc comments