test cases extended;
code review