Fix even more tests!

lol rfc inconsistency