Fixed all the test messages