Slight fixes to tests that happened due to changes in toString() methods. I'm beginning to see the advantage of continuous integration...