Correct POD errors, and add POD tests