Added some more filter tests
Merge branch 'dev-set3-iteration5' of github.com:333fred/wpi-suite-tng into dev-set3-iteration5
Merge branch 'dev-set3-iteration5' of github.com:333fred/wpi-suite-tng into dev-set3-iteration5
Merge branch 'dev-set3-iteration5' of github.com:333fred/wpi-suite-tng into dev-set3-iteration5
Merge branch 'dev-set3-iteration5' of github.com:333fred/wpi-suite-tng into dev-set3-iteration5
Refactored and added more Filter tests
Refactored Filter tests and fixed merge conflicts
Merge branch 'dev-set3-iteration5' of github.com:333fred/wpi-suite-tng into dev-set3-iteration5
Fixed merge conflicts (again) involving filter tests