ODE-1021: All rampart testcases fixed