ssmall name changes; little bit of formatting
Rename test package
Add multiple arg