Small test statement improvements