Added timeout to test