add more tests for retryInalyizer, minor changes