Renamed messages in internal overlay messages and implemented another unit test for issue #242