Fixed travis test issues.