Add longer test timeout
Make null check wait.
Merge pull request #1154 from carsonmcdonald/fixtestpostwithparams

Add longer test timeout
Merge remote-tracking branch 'upstream/master'