Index: trunk/psModules/test/objects/tap_pmSourceUtils.c
===================================================================
--- trunk/psModules/test/objects/tap_pmSourceUtils.c	(revision 15985)
+++ trunk/psModules/test/objects/tap_pmSourceUtils.c	(revision 21223)
@@ -168,11 +168,24 @@
         src->moments = pmMomentsAlloc();
 
-        src->moments->Sx = 1.0;
-        src->moments->y = 2.0;
-        src->moments->Sxy = 3.0;
+        src->moments->Mx = 1.0;
+        src->moments->My = 1.0;
+        src->moments->Mxx = 2.0;
+        src->moments->Mxy= 2.0;
+        src->moments->Myy = 2.0;
+        src->moments->Mxxx = 3.0;
+        src->moments->Mxxy = 3.0;
+        src->moments->Mxyy = 3.0;
+        src->moments->Myyy = 3.0;
+        src->moments->Mxxxx = 4.0;
+        src->moments->Mxxxy = 4.0;
+        src->moments->Mxxyy = 4.0;
+        src->moments->Mxyyy = 4.0;
+        src->moments->Myyyy = 4.0;
+        src->moments->Sum = 2.0;
+        src->moments->Peak = 3.0;
         src->moments->Sky = 4.0;
-        src->moments->Peak = 5.0;
-        src->moments->x = 6.0;
-        src->moments->y = 7.0;
+        src->moments->dSky = 5.0;
+        src->moments->SN = 6.0;
+        src->moments->nPixels = 7.0;
 
         pmModelType type = pmModelClassGetType("PS_MODEL_GAUSS");
@@ -183,7 +196,7 @@
         psF32 *PAR  = model->params->data.F32;
         psEllipseMoments emoments;
-        emoments.x2 = src->moments->Sx;
-        emoments.y2 = src->moments->Sy;
-        emoments.xy = src->moments->Sxy;
+        emoments.x2 = src->moments->Mx;
+        emoments.y2 = src->moments->My;
+        emoments.xy = src->moments->Mxy;
         // force the axis ratio to be < 20.0
         psEllipseAxes axes = psEllipseMomentsToAxes (emoments, 20.0);
@@ -191,6 +204,6 @@
         ok(TEST_FLOATS_EQUAL(PAR[PM_PAR_SKY], src->moments->Sky), "pmSourceModelGuess() returned set model->params[PM_PAR_SKY] correctly");
         ok(TEST_FLOATS_EQUAL(PAR[PM_PAR_I0], src->moments->Peak - src->moments->Sky), "pmSourceModelGuess() returned set model->params[PM_PAR_IO] correctly");
-        ok(TEST_FLOATS_EQUAL(PAR[PM_PAR_XPOS], src->moments->x), "pmSourceModelGuess() returned set model->params[PM_PAR_XPOS] correctly");
-        ok(TEST_FLOATS_EQUAL(PAR[PM_PAR_YPOS], src->moments->y), "pmSourceModelGuess() returned set model->params[PM_PAR_YPOS] correctly");
+        ok(TEST_FLOATS_EQUAL(PAR[PM_PAR_XPOS], src->moments->Mx), "pmSourceModelGuess() returned set model->params[PM_PAR_XPOS] correctly");
+        ok(TEST_FLOATS_EQUAL(PAR[PM_PAR_YPOS], src->moments->My), "pmSourceModelGuess() returned set model->params[PM_PAR_YPOS] correctly");
         ok(TEST_FLOATS_EQUAL(PAR[PM_PAR_SXX], PS_MAX(0.5, M_SQRT2*shape.sx)), "pmSourceModelGuess() returned set model->params[PM_PAR_SXX] correctly");
         ok(TEST_FLOATS_EQUAL(PAR[PM_PAR_SYY], PS_MAX(0.5, M_SQRT2*shape.sy)), "pmSourceModelGuess() returned set model->params[PM_PAR_SYY] correctly");