poc7 changes, pass test contracts