minor setup teardown changes