Revamped testing guide

@huonw mind opening up a new issue with these comments? this already got merged, and I'm not going to get to them tonight, and I don't want to lose them :)