Make PURAP test friendly