refactor to better object oriented style and DRYer tests
Merge pull request #5 from DerekMaffett/fix

refactor to better object oriented style and DRYer tests