rewrote EntityTest to make up for changes