Added unit tests for new filter and policy, renamed variable to make more sense