Update and add test case