More wiring, and extra testing