updated tests to work with 60sec timeout