Updated POD & tests