Fix PHPSpec2 compatibility and remove the expect thing