Merge "Update the Unwinder object and add tests."