More robust test cases.
Merge branch 'patch-3'
Minor project change.