Merge "Migrate rollback tests to CTS (1/n)"