HC Tests: adapt hc2vpp tests to oxygen bump(HONEYCOMB-424)