Tidy up unserializer tests a little