add some tests and timeout