Added missing filters to default set.
Some more refactoring to bring down code duplication. And fixed tests.