Messed up syntax of tests
Merge branch 'PHP-5.6'