Add a branch to test conduit
Update tests