Updated to support Origin builds

This does not solve the fact that some tests are still failing, but it repairs the test infrastructure so that a proper investigation of test failures can occur.