Tweak of test case + driver output