Finalized POD and adjusted test suite (needs revisit)