Juri

Tests enabled on Jenkins (OPS-7), one test disabled until fixed (OPS-14)