Fixed tests for recent constant array changes
Merge branch 'PHP-5.6'