Adjusted some stuff in the test package that was broken by some changes.
Merge pull request #186 from sprowell/master

Fixed a change in the API for the test classes.