expaneded EntityTest (a teeny bit)