Fixed messages
Added new test script