Short complete diagnostic tests for circuits with two additional inputs in some basis

We prove that any Boolean function in $n$ variables can be modeled by a testable Boolean circuit with two additional inputs in the basis “conjunction, oblique conjunction, disjunction, negation” so that the circuit admits a complete diagnostic test of the length at most $2n+3$ with respect to stuck-at faults of the type $1$ at gate outputs.