harder timeout for vm's
Merge branch 'test' into dev