Convert models to use new base model - introduce tests for json conversion.