POD test fixes

Fixes a number of POD test failures