added commit statements because teardown doesn't work