fixed test and some PMD cleanup
added configurable poison pill, some new test scripts for aws, and misc cleanup