refactor tests
fix test imports
cleanup
cleanup
Merge pull request #128 from wri/feature/tests

WIP: Refactoring tests