Ditto
Increase wait time on travis, fix syntax error test