Refactored more tests over to UnitTest11 style