Index: /issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-matlab.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-matlab.sh	(revision 27990)
+++ /issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-matlab.sh	(revision 27991)
@@ -227,6 +227,7 @@
 
 		# Check status
-		STATUS=$(grep 'Status:' ${SIGNED_REPO_COPY}/${NOTARIZATION_LOGFILE} | sed -e 's/[[:space:]]*Status: //')
-		if [[ "${STATUS}" == "success" ]]; then
+		STATUS=$(grep 'status: Accepted' ${SIGNED_REPO_COPY}/${NOTARIZATION_LOGFILE} | wc -l)
+
+		if [[ ${STATUS} -gt 0 ]]; then
 			echo "Notarization successful!"
 			break
Index: /issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-python-3.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-python-3.sh	(revision 27990)
+++ /issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-python-3.sh	(revision 27991)
@@ -227,6 +227,7 @@
 
 		# Check status
-		STATUS=$(grep 'Status:' ${SIGNED_REPO_COPY}/${NOTARIZATION_LOGFILE} | sed -e 's/[[:space:]]*Status: //')
-		if [[ "${STATUS}" == "success" ]]; then
+		STATUS=$(grep 'status: Accepted' ${SIGNED_REPO_COPY}/${NOTARIZATION_LOGFILE} | wc -l)
+
+		if [[ ${STATUS} -gt 0 ]]; then
 			echo "Notarization successful!"
 			break
Index: /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh	(revision 27990)
+++ /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh	(revision 27991)
@@ -186,4 +186,5 @@
 rm -f ${PKG}/lib/*.a # Remove static libraries from package
 rm -f ${PKG}/lib/*.la # Remove libtool libraries from package
+rm -rf ${PKG}/test/MITgcm # Remove MITgcm from package
 rm -rf ${PKG}/test/SandBox # Remove testing sandbox from package
 
Index: /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh	(revision 27990)
+++ /issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python-3.sh	(revision 27991)
@@ -186,4 +186,5 @@
 rm -f ${PKG}/lib/*.a # Remove static libraries from package
 rm -f ${PKG}/lib/*.la # Remove libtool libraries from package
+rm -rf ${PKG}/test/MITgcm # Remove MITgcm from package
 rm -rf ${PKG}/test/SandBox # Remove testing sandbox from package
 
Index: /issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-matlab.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-matlab.sh	(revision 27990)
+++ /issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-matlab.sh	(revision 27991)
@@ -123,4 +123,5 @@
 	find ${PKG}/bin -type f -name *.exe; \
 	find ${PKG}/lib -type f -name *.mexmaci64; \
+	find ${PKG}/test -type f -name *.pkg; \
 )
 
@@ -154,5 +155,5 @@
 
 # Check if UUID exists in response
-HAS_UUID=$(grep 'RequestUUID = ' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE}) # NOTE: Checking for "RequestUUID = " because "RequestUUID" shows up in some error messages
+HAS_UUID=$(grep 'id: ' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE})
 if [ -z "${HAS_UUID}" ]; then
 	echo "Notarization failed!"
@@ -168,5 +169,5 @@
 
 # Get UUID from notarization request response
-UUID=$(echo ${HAS_UUID} | sed 's/[[:space:]]*RequestUUID = //')
+UUID=$(echo ${HAS_UUID} | sed 's/[[:space:]]*id: //')
 echo "UUID: ${UUID}" 
 
@@ -179,4 +180,5 @@
 #
 echo "Checking notarization status"
+SUCCESS=0
 xcrun notarytool log ${UUID} --apple-id "$AD_USERNAME" --team-id "$TEAM_ID" --password "$NOTARY_PASSWORD" &> ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE}
 STATUS=$(grep 'status: Accepted' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE} | wc -l)
@@ -193,4 +195,7 @@
 
 	echo "Notarization successful!"
+
+	# Set flag indicating notarization was successful
+	SUCCESS=1
 else
 	echo "Notarization failed!"
Index: /issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-python-3.sh
===================================================================
--- /issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-python-3.sh	(revision 27990)
+++ /issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-python-3.sh	(revision 27991)
@@ -123,4 +123,5 @@
 	find ${PKG}/bin -type f -name *.exe; \
 	find ${PKG}/bin -type f -name *.pyc; \
+	find ${PKG}/test -type f -name *.pkg; \
 )
 
@@ -163,5 +164,5 @@
 
 # Check if UUID exists in response
-HAS_UUID=$(grep 'RequestUUID = ' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE}) # NOTE: Checking for "RequestUUID = " because "RequestUUID" shows up in some error messages
+HAS_UUID=$(grep 'id: = ' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE})
 if [ -z "${HAS_UUID}" ]; then
 	echo "Notarization failed!"
@@ -177,5 +178,5 @@
 
 # Get UUID from notarization request response
-UUID=$(echo ${HAS_UUID} | sed 's/[[:space:]]*RequestUUID = //')
+UUID=$(echo ${HAS_UUID} | sed 's/[[:space:]]*id: //')
 echo "UUID: ${UUID}" 
 
@@ -188,4 +189,5 @@
 #
 echo "Checking notarization status"
+SUCCESS=0
 xcrun notarytool log ${UUID} --apple-id "$AD_USERNAME" --team-id "$TEAM_ID" --password "$NOTARY_PASSWORD" &> ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE}
 STATUS=$(grep 'status: Accepted' ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE} | wc -l)
@@ -202,4 +204,7 @@
 
 	echo "Notarization successful!"
+
+	# Set flag indicating notarization was successful
+	SUCCESS=1
 else
 	echo "Notarization failed!"
Index: /issm/trunk-jpl/packagers/win/package-issm-win-binaries-matlab.sh
===================================================================
--- /issm/trunk-jpl/packagers/win/package-issm-win-binaries-matlab.sh	(revision 27990)
+++ /issm/trunk-jpl/packagers/win/package-issm-win-binaries-matlab.sh	(revision 27991)
@@ -87,7 +87,4 @@
 	exit 1
 fi
-
-echo "Moving MATLAB libraries to bin/"
-cp ${MATLAB_PATH}/bin/win64/libmex.dll .
 
 echo "Moving MEX-files to bin/"
