Added timeout in test methods