DATAREST-414: Apply split up test mechanism