Refactor of attribute names, first passing test for deserialization of  the simple model.