Improved conformance to common DRY project conventions.
Ensured that the Coverity branch builds test cases as well.
Merged the latest from the 'master' branch.