refactored to use PTD namespace
added inline code comments
fix for unit tests running with pods