Merge "Optimize kitchen tests for Travis CI and fix test repo"