First pass at factoring out test constructs, cleanup of e2e tests
Merge pull request #42 from pmorie/deploy-trigger-wip

First pass at factoring out test constructs, cleanup of e2e tests