* BAEL-5982 | Article code * Renaming unit test methods * Rearranging module list in alphabetic order