Merge pull request #202 from spadgett/master

fix setup and teardown methods