Got the test build working in the new source tree