convert some unit tests to modern style. (not really modern, just killing Assertion!)