cleaning up and rechecking some of the wiring tests