Fixed broken queryKD tests and bad variable names