Fixed messages
Fixed test script