Making tests pass. Still need to work on the Inputformats for Entities and Events