[Testing] improvements and travis troubleshoot