POD updated; slight refactoring of tests