Minor fix to tests and addressing code review comment