Bug 901972 - Fix test bustage introduced by filtering code