CX Fix Build Testing