Changed unittest timeout to 30secs