* improve tests

* fixes

* fixes

* fixes

* Apply suggestions from code review
Co-authored-by: smartcontracts <kelvin@optimism.io>

* fixes

---------
Co-authored-by: smartcontracts <kelvin@optimism.io>