#207. JSON Custom Serialization Handling

Also improved test for JSON serialisation