Resolve Travis Tests Further