Upgrade phpunit to 4
Add a filter wrapper and relevant tests