Test refactor

@monfresh ready for review. 

I refactored the test custom value tests that were failing in #332. 
I also pulled all the expectations out of test session helpers to address #331 and put them as shared tests in  the filter spec. I'm not sure if this is the best place for them, but let's open an issue/make another PR for that if that's not the best way to address those.