Merge "Fixing spelling errors in messages when tests are skipped"