Fixing tests, removed a return; where it should not be and corrected an assert.
Adding php 5.5 to .travis.yml