#19 more unit tests passing. Picklist unit tests remaining.