ARELLE-269 regression testing fixes