BLK-230 patch persistence in unit tests