changes to testing, added teardown