Update tests for 766 merge.