Added realistic message to the test
Fixing minor bugs and minor refactoring.