Fixed unit tests
Merge branch '4.1-dev' of https://github.com/adaptivecomputing/torque into 4.1-dev