moved the wiring fix into core.tox