Tests now use explicit types.
Broke up channel tests.