Added visual, labeled tests.  Also refactored code
Merge pull request #18 from eah13/tests

Improved tests