Fixed several unit tests that had become broken.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev