Merge pull request #113 from jrrideout/death-march

Death march
Fix unit tests in test_command
Fix optparse tests
Fix input handler tests