Merge pull request #4872 from kumpera/add_test_for_eloop