Migrated to docopt, added more integration_tests