Test generation improvements

 - Version 8.3.1