changes as per code review comments for test