gofmt
Fix test
Clean up sentinel channels