Fix testing suite