Added entitz USer and EventLocation, more tests