add timeouts + some tests