Fix testing mechanism