Corrected unitary tests
Moved processors and switches back to globals