Fix testing...