displaying diffs and annotations fixed

hopefully fixes the tests too

mergerequest refs #1274