Bump up test timeouts and clean up integration tests