Remove reference to discussion on p6l
Add tests for #121434, can now be closed