Fix for php 5.5 compatibility
Add more php versions to test