Fix up tests after path changes.