junit test tweak after bad merge.