Merge pull request #17 from pmorie/custompod-wip

Refactor custom pod unit tests
Cleanup