Fixing the tests up for Json serialisation