ENH Better output. Simpler code.
ENH Test whether inverted threshold test is better

The previous code worked for this case because of the way it was set up,
but it was not generally correct.