Lower timeout
Integration tests and other updates