* Update to latest Substrate

* Fix tests

* Update src/main.rs

Co-Authored-By: gavofyork <[email protected]>