Making test running against phpunit 4.*, and fix phpunit version for dev