refactor
Merge pull request #36 from mikehoren/TESTS

refactor