Definition and extension annotations are now merged. The merge
strategy is to override to the benefit of the extension one. The test of
error raising in this case (duplicate annotation) now being obsolete, I
removed it.
Adding missing test files