Made acceptance test timeouts more robust