Make test-end-to-end more readable
Golint is broken on Mac
test-cmd should use raw 'osc' calls