Updated with test case