SCI-1264: Ensure tests are independent