Change the way default filters are created. Add specs to filter_builder

This fixes #21