Updating annotation matcher and test code