Split out socket code

Moved some channel tests into the channel test file.