Updates to Fields and unit tests for serialization and deserialisation of models.