Bug 20589: Remove expanded_facet variable and fix tests