Merge "Add a rollback test" into sc-dev