mergeing NewRetryTest.java