removed timeouts cos they are hard
0.4.0