update annotation and test cases