MIST-150 Add Rollback method and related tests