Fixing several TODOs.
Mainly in the Filtering unit test.