Fixed the broken picklist tests