Yet another update to upctest pnd.