[Fixup bc05a25] Improve test
[Fixup a2deb3f] Incorporate suggestions