OptionParser: Fix some tests