Generalize test building to work against both x86 and x64