Follow-up to 79c72ef: Fix test failure and use slice instead of filter