More tests added.
Minor bugs fixed.

Next step: Channels