Extend unit test to include field search based on type/customer. Remove predicate as it fails