Make waits longer to try and solve intermittent failures on build server
Merge pull request #184 from jparyani/change-test-waits

Make waits longer to try and solve intermittent failures on build server