20120801 ======== - Continued with getting the test suite running again.