Fix for broken filters where this context was lost.

fixes #2157
- Change tests to only check for existance
- Use _.pick instead of directly assigning functions