Removing timeout retry logic, as no way to retry
added more test cases and refactored tests