Separated dist and test for graphing and analysis.