Refactored test into separate components
Converted test to use testing package.  Discovered go test -v option!