Rewrite the 'P test'

I liked what was there before, but someone (can't remember who) suggested it was a bit geeky and not so friendly for beginners.