Correct code review comments on test