Fix bug with restoring r16-17, add new test file.