Merge pull request #16 from pmorie/deploy-trigger-wip

Fix validation unit tests
Fix nit in validation tests