Improved tests and POD