NOREF: Eliminating a little more test code