updated versions of setup and teardown scripts