Removed commented setup and teardown for tests