Companion Fix testing