Variable result table pruning is buggy, remove for now, also adding improved tests...