Refactoring code to avoid duplicity of messages.
Removing tests (which are not reliable).