Rather than switch this, can we have the test both ways?