Fix testing issues