Refactor tests
Merge pull request #2 from jbgh/JB_refactor1

Refactor tests