fix callbacks on channel, get tests to pass