Additional tests, Filtering improvements