Test fixes
Merge pull request #1349 from xispa/hotfix/next

Test fixes
Merge remote-tracking branch 'upstream/hotfix/next' into hotfix/next
Test 1 to check LIMS-1323