Issue #3014011 by amateescu, andypost: Remove a couple of workarounds from DefaultConfigTest and ModuleHandlerTest