Fix filters and add some additional mocks.
Merge branch 'master' of github.com:ericmann/wp_mock