diff --git a/km3net_testdata/data/astro/ARCA_moon_sun_position_benchmark.csv b/km3net_testdata/data/astro/ARCA_moon_sun_position_benchmark.csv
index 55ae7f00e10cb9cb658c8ffc7cf62d8b7c782421..955b24cf84b43f358b017d5cd10564b4d91c181c 100644
--- a/km3net_testdata/data/astro/ARCA_moon_sun_position_benchmark.csv
+++ b/km3net_testdata/data/astro/ARCA_moon_sun_position_benchmark.csv
@@ -6,11 +6,11 @@
 # theta, phi: track in horiz. UTM
 # DEC/RA: source in equatorial coordinates
 date,time,object,azimuth,zenith,RA,DEC,RA-J2000,DEC-J2000
-2028-11-08,23:34:54.00,Moon,201.331,69.498,128.18189954111062,16.746090697761872,127.76959201067646,16.84536792810626
-2028-10-22,10:30:45.40,Moon,184.18,57.834,267.48866304669923,-25.81631718020281,267.0374698404048,-25.80772948619773
-2022-03-02,18:20:35.30,Moon,19.697,122.894,345.00254165365584,-11.801457803552266,344.7148477756722,-11.918774403237144
-2020-11-15,07:03:22.50,Moon,175.671,59.308,233.43561482527144,-17.404739596135915,233.14437220222226,-17.336225736408874
-2028-11-08,23:34:54.00,Sun,79.495,153.882,224.63146076704072,-16.93868054371806,224.22359518773547,-16.8222518928673
-2028-10-22,10:30:45.40,Sun,282.752,55.21,207.48618297624782,-11.315704084788752,207.09863211162985,-11.171320563347589
-2022-03-02,18:20:35.30,Sun,177.667,100.873,343.5307236719834,-7.007549269137534,343.2455307403015,-7.123970524571582
-2020-11-15,07:03:22.50,Sun,326.969,85.016,230.98587735997808,-18.616231592934312,230.69351717759642,-18.543877377194516
+2028-11-08,23:34:54.00,Moon,2.909073320496469,64.09014600870186,128.18189954111062,16.746090697761872,127.76959201067646,16.84536792810626
+2028-10-22,10:30:45.40,Moon,323.7553138203656,85.53172445566834,267.48866304669923,-25.81631718020281,267.0374698404048,-25.80772948619773
+2022-03-02,18:20:35.30,Moon,180.51105255217053,110.30453542469576,345.00254165365584,-11.801457803552266,344.7148477756722,-11.918774403237144
+2020-11-15,07:03:22.50,Moon,325.9879286902175,75.86100117638195,233.43561482527144,-17.404739596135915,233.14437220222226,-17.336225736408874
+2028-11-08,23:34:54.00,Sun,54.78405481776177,157.13496216200542,224.63146076704072,-16.93868054371806,224.22359518773547,-16.8222518928673
+2028-10-22,10:30:45.40,Sun,273.8155520772146,47.662839609511856,207.48618297624782,-11.315704084788752,207.09863211162985,-11.171320563347589
+2022-03-02,18:20:35.30,Sun,175.46975373689048,108.71936411869535,343.5307236719834,-7.007549269137534,343.2455307403015,-7.123970524571582
+2020-11-15,07:03:22.50,Sun,323.37927354643625,75.14234015127076,230.98587735997808,-18.616231592934312,230.69351717759642,-18.543877377194516
diff --git a/km3net_testdata/data/astro/ORCA_moon_sun_position_benchmark.csv b/km3net_testdata/data/astro/ORCA_moon_sun_position_benchmark.csv
index 1d021fcc65a6350a584f54ea7759150096341b1d..822153b6333214a29c1299c8305bd15265b40109 100644
--- a/km3net_testdata/data/astro/ORCA_moon_sun_position_benchmark.csv
+++ b/km3net_testdata/data/astro/ORCA_moon_sun_position_benchmark.csv
@@ -6,11 +6,11 @@
 # theta, phi: track in horiz. UTM
 # DEC/RA: source in equatorial coordinates
 date,time,object,azimuth,zenith,RA,DEC,RA-J2000,DEC-J2000
-2028-11-08,23:34:54.00,Moon,201.331,69.498,128.14636697331102,16.623005664223662,127.73434194428125,16.722203565207135
-2028-10-22,10:30:45.40,Moon,184.18,57.834,267.47197159481044,-25.828621208629148,267.0207368060147,-25.819986319050518
-2022-03-02,18:20:35.30,Moon,19.697,122.894,345.0461398295588,-11.913264039099182,344.75839682166486,-12.030605992213093
-2020-11-15,07:03:22.50,Moon,175.671,59.308,233.43490665783682,-17.44344038679752,233.14359660155628,-17.37492534498231
-2028-11-08,23:34:54.00,Sun,79.495,153.882,224.6310971482711,-16.938927075912133,224.22323126271021,-16.822497707142006
-2028-10-22,10:30:45.40,Sun,282.752,55.21,207.48648269369278,-11.315869222814259,207.09893145843193,-11.171486085825158
-2022-03-02,18:20:35.30,Sun,177.667,100.873,343.5308366102718,-7.00780643787399,343.245643541187,-7.124227764978525
-2020-11-15,07:03:22.50,Sun,326.969,85.016,230.98587831105226,-18.616316178850905,230.69351798324212,-18.543961964464437
+2028-11-08,23:34:54.00,Moon,3.6576081307033697,71.35092471098154,128.14636697331102,16.623005664223662,127.73434194428125,16.722203565207135
+2028-10-22,10:30:45.40,Moon,327.50374350367105,95.51487556588009,267.47197159481044,-25.828621208629148,267.0207368060147,-25.819986319050518
+2022-03-02,18:20:35.30,Moon,182.3629237631143,102.9049876392159,345.0461398295588,-11.913264039099182,344.75839682166486,-12.030605992213093
+2020-11-15,07:03:22.50,Moon,329.4730320298386,85.82529348115085,233.43490665783682,-17.44344038679752,233.14359660155628,-17.37492534498231
+2028-11-08,23:34:54.00,Sun,79.70329200113498,153.9378774528576,224.6310971482711,-16.938927075912133,224.22323126271021,-16.822497707142006
+2028-10-22,10:30:45.40,Sun,282.81136809229497,55.29317394428203,207.48648269369278,-11.315869222814259,207.09893145843193,-11.171486085825158
+2022-03-02,18:20:35.30,Sun,177.61571675181744,100.73492436869027,343.5308366102718,-7.00780643787399,343.245643541187,-7.124227764978525
+2020-11-15,07:03:22.50,Sun,326.95040650052243,85.1365073995754,230.98587831105226,-18.616316178850905,230.69351798324212,-18.543961964464437