added test case & changes