Fix tests to better reflect doc matching updates