A lot of new tests in filter_rule_test (cool), but most of the key changes are in content_view_definition.  This seems to imply one of the following:
- content_view_definition needs tests
- the filter_rule_test should be in content_view_definition_test
- the logic in content_view_definition might better fit in filter_rule
- etc