Merged pull request #1 from doy/master.
jjn1056 [Tue, 26 Apr 2011 18:29:44 +0000 (11:29 -0700)]
test suite fixes


Trivial merge