Get some tests to pass
Temporarily disable conduit-extra