brought tests up-to-date, increased timeout on query roundtime to 120 seconds