Attempting a fix for the unit tests ResourceTranslatorTest and *ListenerTest.