Updating tests for filter id changes