Add some more tests for Thunderbird recognition.
Reformatted code a bit.

refs #3252