CSIT-664: Refactor setups and teardowns