More readable pod.  A few test tweaks.