Add EntityDeserializer and add more integration tests and test data