Fixing some of the test code.

Getting up to 96 code coverage... still room to improve!