SOP-2659 Fix broken syntax after unit testing