KAAHE-479 #comment improve unit-test