improve P24 test