Cleanup of test environment
Add support for 'args' parameter
Merge pull request #1 from wndhydrnt/pass_args

Add support for 'args' parameter