modified setup and teardown; added some more tests