Minor changes into test utils.