Another small update to upctest pnd.