Fix php unit + code improvement
Fix php unit + code improvement