Merge pull request #201 from tbeckham/testing

GA run stability improvements.
Increase timeouts to 5 minutes because Shaon's VMware setup is sooooo slow.