Hardening more tests - not that the RFC resembles reality anyway