[JBJCA-925] Expand annotation test suite  - clean up
[JBJCA-925] Expand annotation test suite  - clean up

ironjacamar/ironjacamar,jandsu/ironjacamar,maeste/ironjacamar,darranl/ironjacamar,ironjacamar/ironjacamar,jesperpedersen/ironjacamar,jpkrohling/ironjacamar,johnaoahra80/ironjacamar,ironjacamar/ironjacamar,rarguello/ironjacamar