Switch last few modules over to argparse
Remove notes from unittest that were causing warnings for being too low