Fix testing according to spec