adds missing channel on user
tests for masquerading
adds more whoami test; some cleanup