fixed more overzealous search and replace as well as some issues with the Lang test