CRA-749 Loop-error in test-suite