[NFC] CRM-19033 improve standardisation of tests