Fix testing errors