Tweak deserialisers and add test case for usage deserialiser