Fixes for python 2.6.6 compatibility: Fix bugs in unittests (set instead of dict), and add argparse as a dependency.