Tweaked screen output, adding a none option that plays better with the test script