Merge pull request #596 from wfrench/master

Update Egg Launch Tests
Merge remote-tracking branch 'upstream/master'