fix all issues raised by the review

4 jobs for 317804-unit-test in 9 minutes and 45 seconds (queued for 1 second)