Better Travis-CI testing scheme