Convert classmethod to staticmethod. Fix a couple bugs from covariance_experiment.py.
Merge.