Update diff and get tests passing on 8.1.