#4137 remove redundant code
#4137 updating test