Merge "take II: variance_test partial clean-up" into nextgenv2