Fix tests to work correctly with phpunit 4.3