Fix copy-paste typo in finish_args
Add tests
Make new test work in python 3
Adjust messages for python-3.3
Merge remote-tracking branch 'ZyX-I/fix-finish_args-typo' into kruton