Merge "Minor modifications in the tests code" into nitrogen