Fixed remaining failing tests by implementing the replacing of objects
in the filter as required