Fixed a couple of previously commented tests
Removed an unused method and fixed a validation issue with filters
Fixed based on suggestions from PR 1751
Commented out tests that would be worked on later
Merge pull request #1751 from parthaa/filter-updates

Filter updates