Fixing issue with test refactoring.
Merge pull request #177 from spankyj/master

Fixing issue with test refactoring.
update default test timeout from 30secs to 15sec 

update default test timeout from 30secs to 15sec 
CR: jseanxu
Merge branch 'master' into banguero/testsaucelabs-runut