Tweak broken serialize tests from commit 879799fe955f01b85b59fd8a0096d415fc48df03...