added some tests and fixed filtering again.
Merge branch 'master' of github.com:SmileyBone/ZachAndJohnTDDAssignment
actually fixed the filter this time. I think.