Fix test bench, reorganise pinouts