Optimization
Fixed test for php5.3