Fix and update tests

Increased pdiff timeout to 30 seconds because 15 wasn't long enough on
my beleaguered MacBook Air.