Corrected public test cases, improved testability using id=fpr_*.