Add 15th PTH test point
Merge conflict in passives
Fix glitch in passives