* Add implementation for BAEL-5373. * Fix test class name. * Change collection names to be aligned with article.