ENGINE-1592 + ENGINE-1593 : Add comment + Modify a test