Minor fix + added new test case to test suite