updated tests to work with 60sec timeout
Merge remote-tracking branch 'upstream/master'