Fix some tests for php 5.3 - Part 2