Improved some brittle tests.
Merge pull request #3 from keithj/devel

Improved some brittle tests.