Add a couple of tests more for decoding