Clean up and test generating normal correlations