Fix merged tests