Added tests re custom serialisation