Fix failing tests
Merge branch 'merge-without-activation-changes' into fix-failing-tests
Merge pull request #849 from DirectEmployers/fix-failing-tests

Fix failing tests
Merge branch 'merge-without-activation-changes' into fix-state-filter-take-2