Updated the unit tests and cleaned the submodules' interdependencies a bit.
Left a couple of loose ends in Filtering. They're commented out and marked as
TODO.
Filtering is still also a bit of a freak when it comes to dependencies. I feel
it could use some refactoring, but now's simply not the time.