Various improvements in @UnitTest.