BUG-731: limit protected field visibility

One field can become private, others get @VisibleForTesting

Change-Id: I2d5214620a83953dae080d4a1f67e1e6470944e9
Signed-off-by: Robert Varga <rovarga@cisco.com>