Improvements to JPAKE tests