Minor
Do not skip the test when there is the word 'error' since it's always there ("no error" is displayed when there's no error)
Merge remote-tracking branch 'origin/master'