Merge pull request #5589 from marek-safar/tests