removed redundant using statements
Fixing test name
Merge pull request #2 from pmacn/cleanup

Cleanup