Make testing conditional.
Merge pull request #1 from pgj/master

A simple change to make testing conditional.