Also moving the associated unit tests to the correct package beans.factory.annotation Issue: SPR-10458