unit tests fixed
query timeout increased