While trying to illustrate the griefing attack with a functional test, I found another bug Will link to a fix PR here.
Update:
Aside from the fix it illustrates the griefing attack above.