Fix copy-paste typo in finish_args
Add tests
Merge branch 'fix-finish_args-typo' into local-develop