Attempt to fix tests on php5.2 and 5.3