Fix failing tests, remove PHP 5.4 short array syntax