LOADUI-1369 Fixing and refactoring tests
Fixed broken merge
Merge test fixes into next