joint tests and fix entity test comments
doc regen