removed Users (use Channels), makefile: ok, test coverage: ok