OC-6037: Refactor tests to avoid side-effects on other tests