renamed test class according to psr-0
Merge branch 'hotfix/4905'

Close #4905
Fixes #3835
Merge pull request #4909 from prolic/renamed-test

renamed test class according to psr-0
Merge branch 'hotfix/4909' into develop

Forward port #4909