test cleanup regarding to issue #2522
Merge pull request #2579 from gurbuzali/test-cleanup/3.2.3

Test cleanup/3.2.3