Improve PME testing