Added in all the new entities
Fixed test that would sometimes break