Changes to make test data easier

Added a few lines to make generating different test data easier and went
back to restricting the cross correlation term in 2D gauss fits.

DSB