[#42224671] Refactoring
[#42224671] Test aliquot type on target and source