Made more model classes de-serializable from JSON so they can be used for integration testing.