Bugfixed filters and repaired tests.