PLFM-1420 Add more unit tests per code review