Update

TestFinishView fix and x86