Various updates correcting testSGP(3) bugs so that EOCT targets are calculated correctly