Update to match changes of TestAnnotation package