Fix most ORCA unit tests

These fixes leave just one ORCA test unresolved, so we're not quite done yet with #41.