Changed tests files structure.
(cherry picked from commit 2150ee4)
Changed tests classes names by new structure.
(cherry picked from commit 7e552e3)