Re: #1508 fixed old tests