JZ: Fix tests. Avoid clobbering original err msgs