Adding testing for list of entities