Fix up cabal file, re-add Registry module and tests