Clean up tests
Fix stresstest and add to run-tests.sh
Clean up imports
Address review comments
Fix reset method
Merge pull request #7 from dminor/more-testing

More testing