FIX: pep8 + Py3 fixes in test_dist_metrics