Fix broken builds by moving test to x86 dir