WELD-1600 Use the correct BDA ID when creating a new AnnotatedType
WELD-1600 Testcase
WELD-1600 Deal with the rest of the scenarios