diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 0.3.1.1 - 2022-03-21
+
+### Fixed
+
+ - Add test data that was missing from the sdist tarball
+
+### Removed
+
+ - Clean up inline-c generated exports
+
 ## 0.3.1.0 - 2022-03-18
 
 ### Added
diff --git a/hercules-ci-cnix-expr.cabal b/hercules-ci-cnix-expr.cabal
--- a/hercules-ci-cnix-expr.cabal
+++ b/hercules-ci-cnix-expr.cabal
@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:           hercules-ci-cnix-expr
-version:        0.3.1.0
+version:        0.3.1.1
 synopsis:       Bindings for the Nix evaluator
 category:       Nix, CI, Testing, DevOps
 homepage:       https://docs.hercules-ci.com
@@ -13,6 +13,8 @@
 build-type:     Custom
 extra-source-files:
     CHANGELOG.md
+    test/data/sample.json
+    test/data/simple-flake/flake.nix
 
 data-dir: data
 data-files:
diff --git a/src/Hercules/CNix/Expr.hs b/src/Hercules/CNix/Expr.hs
--- a/src/Hercules/CNix/Expr.hs
+++ b/src/Hercules/CNix/Expr.hs
@@ -10,7 +10,45 @@
 {-# LANGUAGE TypeFamilies #-}
 
 module Hercules.CNix.Expr
-  ( module Hercules.CNix.Expr,
+  ( init,
+    setTalkative,
+    setDebug,
+    setGlobalOption,
+    setOption,
+    logInfo,
+    withEvalState,
+    withEvalStateConduit,
+    addAllowedPath,
+    addInternalAllowedPaths,
+    evalFile,
+    newStrings,
+    appendString,
+    evalArgs,
+    autoCallFunction,
+    isDerivation,
+    isFunctor,
+    getRecurseForDerivations,
+    getAttr,
+    mkNullableRawValue,
+    getAttrs,
+    getDrvFile,
+    getAttrBool,
+    getList,
+    getAttrList,
+    valueFromExpressionString,
+    callFunction,
+    apply,
+    mkPath,
+    getFlakeFromFlakeRef,
+    getLocalFlake,
+    getFlakeFromGit,
+    getFlakeFromArchiveUrl,
+    ToRawValue(..),
+    ToValue(..),
+    FromValue(..),
+    ViaJSON(..),
+
+    -- * Re-exports
     RawValue,
     rawValueType,
     module Hercules.CNix.Store,
diff --git a/src/Hercules/CNix/Expr/Context.hs b/src/Hercules/CNix/Expr/Context.hs
--- a/src/Hercules/CNix/Expr/Context.hs
+++ b/src/Hercules/CNix/Expr/Context.hs
@@ -1,10 +1,16 @@
 {-# LANGUAGE EmptyDataDecls #-}
 {-# LANGUAGE QuasiQuotes #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TemplateHaskellQuotes #-}
 
 module Hercules.CNix.Expr.Context
-  ( module Hercules.CNix.Expr.Context,
+  ( context,
+    evalContext,
+    EvalState,
+    Value',
+    Attr',
+    BindingsBuilder',
     module Hercules.CNix.Store.Context,
+    (=:),
   )
 where
 
diff --git a/src/Hercules/CNix/Expr/Raw.hs b/src/Hercules/CNix/Expr/Raw.hs
--- a/src/Hercules/CNix/Expr/Raw.hs
+++ b/src/Hercules/CNix/Expr/Raw.hs
@@ -1,7 +1,15 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Hercules.CNix.Expr.Raw where
+module Hercules.CNix.Expr.Raw
+  ( RawValue (..),
+    mkRawValue,
+    RawValueType (..),
+    rawValueType,
+    forceValue,
+    canonicalRawType,
+  )
+where
 
 import Hercules.CNix.Expr.Context
 import qualified Language.C.Inline.Cpp as C
diff --git a/src/Hercules/CNix/Expr/Typed.hs b/src/Hercules/CNix/Expr/Typed.hs
--- a/src/Hercules/CNix/Expr/Typed.hs
+++ b/src/Hercules/CNix/Expr/Typed.hs
@@ -2,7 +2,30 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Hercules.CNix.Expr.Typed where
+module Hercules.CNix.Expr.Typed
+  ( Value (..),
+    NixInt,
+    NixFloat,
+    NixString,
+    NixPath,
+    NixAttrs,
+    NixList,
+    NixFunction,
+    NixPrimOp,
+    NixPrimOpApp,
+    NixExternal,
+    unsafeAssertType,
+    Match (..),
+    match,
+    match',
+    getBool,
+    getStringIgnoreContext,
+    hasContext,
+    CheckType (..),
+    assertType,
+    HasRawValueType (..),
+  )
+where
 
 import Control.Exception (throwIO)
 import Hercules.CNix.Expr.Context
diff --git a/test/data/sample.json b/test/data/sample.json
new file mode 100644
--- /dev/null
+++ b/test/data/sample.json
@@ -0,0 +1,1 @@
+{"evaluationDependencies":[{"outputName":"out","index":0,"derivation":{"status":"BuildSuccess","derivationPath":"/nix/store/n35qnfkwxjhfymb50l3q5sdzkab7hnbh-cabal2nix-hercules-ci-cli.drv"}},{"outputName":"out","index":1,"derivation":{"status":"BuildSuccess","derivationPath":"/nix/store/68gb4lfd5fbfx4b4yw4gqdnp516blq8m-cabal2nix-hercules-ci-agent.drv"}},{"outputName":"out","index":2,"derivation":{"status":"BuildSuccess","derivationPath":"/nix/store/bkr8lyjjgbrp0l8jq2aq38xi1jna60by-cabal2nix-hercules-ci-api-agent.drv"}},{"outputName":"out","index":3,"derivation":{"status":"BuildSuccess","derivationPath":"/nix/store/gykwqfjbn4kqz7fxcxympmvaxnvhb03n-cabal2nix-hercules-ci-api-core.drv"}},{"outputName":"out","index":4,"derivation":{"status":"BuildSuccess","derivationPath":"/nix/store/skli1vr8yinzi4i7d7jla67ymjxym5s7-cabal2nix-hercules-ci-cnix-store.drv"}},{"outputName":"out","index":5,"derivation":{"status":"BuildSuccess","derivationPath":"/nix/store/x54psjsdr53aqiqcxm9c4syypm697vy3-cabal2nix-hercules-ci-cnix-expr.drv"}},{"outputName":"out","index":6,"derivation":{"status":"BuildSuccess","derivationPath":"/nix/store/rz13gdd7waarqr6b0s1pzvhy6pb4vllr-cabal2nix-hercules-ci-api.drv"}}],"derivationsBuildingCount":0,"unmetAgentRequirements":[],"evaluationLog":"05707361-542f-4e26-89df-a00b85b3855c","agentVersion":"0.8.2","derivationsDependencyFailureCount":0,"derivationsBuildSuccessCount":2221,"derivationsBuildFailureCount":0,"attributes":[{"path":["count"],"value":{"Ok":{"status":"BuildFailure","derivationPath":"/nix/store/bnzi2abvrj8w5pdmcqhnch1qx2nxaqfh-effect-secrets-test.drv"}},"typ":"Effect"},{"path":["hello"],"value":{"Ok":{"status":"BuildSuccess","derivationPath":"/nix/store/90jjw94xiyg5drj70whm9yll6xjj0ca9-hello-2.10.drv"}},"typ":"Regular"}],"derivationsWaitingCount":0,"derivationsCancelledCount":0,"derivations":{},"id":"05707361-542f-4e26-89df-a00b85b3855c","messages":[],"agentHostname":"agent-2"}
diff --git a/test/data/simple-flake/flake.nix b/test/data/simple-flake/flake.nix
new file mode 100644
--- /dev/null
+++ b/test/data/simple-flake/flake.nix
@@ -0,0 +1,7 @@
+{
+  description = "A very simple flake";
+  inputs = { };
+  outputs = { ... }: {
+    lib.greeting = "hello flake";
+  };
+}