Fixed for case when testvars is not a factor