Handle message prefixes that contain a username but not a hostname
Add more callback tests