Allow build to fail on php5.5
More tests and refactoring