#4131 replace end to end test