minor tests improvement