Extend unit test to include field search based on type/customer