FIX Renamed tests to *Test.php to fit the phpunit format
Merge branch 'master' into 3.0