Bug 1105432 - Add back testing code and messages, which was removed by bug 1063791. r=mcote