Added new test case and updated existing one