Added timeout and test works