SPLEVO-378 Test code improvement