adds some more tests
adds unmarshalling hooks