Modernizes a few lines of tests I forgot.