Complete the JSONDecoder for all of the entity classes and relevant test cases