Minor testing changes