Changed filter rule parameter conventions
Added tests to check the new age params
Removing commented code
Made some modifications on the unit test as suggested in PR 1746
Small test fix with the hope that it'll make travis happy
Merge pull request #1746 from parthaa/filter-rule-changes

Filter rule changes