More tests. Mostly filter I think...
Merge branch 'dev-set3-iteration5' of https://github.com/333fred/wpi-suite-tng into dev-set3-iteration5
Merge branch 'dev-set3-iteration5' of https://github.com/333fred/wpi-suite-tng into dev-set3-iteration5