travis-ized.  And fixed failing test in 1.5.0-RC16