adding tests and configuring timeouts better