Separate window for the message

Fix tests, remove superfluous test code.