Removed spurious messages, fixed unittest errors