diff --git a/__tests__/Foo/Foo__Test.re b/__tests__/Foo/Foo__Test.re
index e4471e53..2b2338d1 100644
--- a/__tests__/Foo/Foo__Test.re
+++ b/__tests__/Foo/Foo__Test.re
@@ -3,15 +3,81 @@ open Expect;
 
 let shape: DistTypes.xyShape = {xs: [|1., 4., 8.|], ys: [|8., 9., 2.|]};
 
-let step: DistTypes.xyShape = {
-  xs: [|1., 4., 8.|],
-  ys: [|8., 17., 19.|],
-} /*   }*/ /*     )*/;
+let makeTest = (str, item1, item2) =>
+  test(str, () =>
+    expect(item1) |> toEqual(item2)
+  );
 
-// describe("Shape", () =>
-//   describe("XYShape", () => {
-//     test("#ySum", () =>
-//       expect(XYShape.ySum(shape)) |> toEqual(19.0)
-//     );
-//     test("#yFOo", () =>
-//       expect(Discrete.integrate(shape)) |> toEqual(step)
\ No newline at end of file
+describe("Shape", () => {
+  describe("Continuous", () => {
+    open Distributions.Continuous;
+    let continuous = make(shape, `Stepwise);
+    makeTest("minX", T.minX(continuous), Some(1.0));
+    makeTest("maxX", T.maxX(continuous), Some(8.0));
+    makeTest(
+      "pointwiseFmap",
+      T.pointwiseFmap(r => r *. 2.0, continuous) |> getShape |> (r => r.ys),
+      [|16., 18.0, 4.0|],
+    );
+    makeTest(
+      "xToY at 4.0",
+      T.xToY(4., continuous),
+      {continuous: 9.0, discrete: 0.0},
+    );
+    makeTest(
+      "xToY at 0.0",
+      T.xToY(0., continuous),
+      {continuous: 8.0, discrete: 0.0},
+    );
+    makeTest(
+      "xToY at 5.0",
+      T.xToY(5., continuous),
+      {continuous: 7.25, discrete: 0.0},
+    );
+    makeTest(
+      "integral",
+      T.Integral.get(~cache=None, continuous) |> getShape,
+      {xs: [|4.0, 8.0|], ys: [|25.5, 47.5|]},
+    );
+    makeTest(
+      "integralXToY",
+      T.Integral.xToY(~cache=None, 2.0, continuous),
+      25.5,
+    );
+    makeTest("integralSum", T.Integral.sum(~cache=None, continuous), 73.0);
+  });
+
+  describe("Discrete", () => {
+    open Distributions.Discrete;
+    let shape: DistTypes.xyShape = {xs: [|1., 4., 8.|], ys: [|8., 9., 2.|]};
+    let discrete = shape;
+    makeTest("minX", T.minX(discrete), Some(1.0));
+    makeTest("maxX", T.maxX(discrete), Some(8.0));
+    makeTest(
+      "pointwiseFmap",
+      T.pointwiseFmap(r => r *. 2.0, discrete) |> (r => r.ys),
+      [|16., 18.0, 4.0|],
+    );
+    makeTest(
+      "xToY at 4.0",
+      T.xToY(4., discrete),
+      {discrete: 9.0, continuous: 0.0},
+    );
+    makeTest(
+      "xToY at 0.0",
+      T.xToY(0., discrete),
+      {discrete: 8.0, continuous: 0.0},
+    );
+    makeTest(
+      "xToY at 5.0",
+      T.xToY(5., discrete),
+      {discrete: 7.25, continuous: 0.0},
+    );
+    makeTest(
+      "integralXToY",
+      T.Integral.xToY(~cache=None, 2.0, discrete),
+      11.0,
+    );
+    makeTest("integralSum", T.Integral.sum(~cache=None, discrete), 19.0);
+  });
+});
\ No newline at end of file
diff --git a/src/components/charts/DistPlusPlot.re b/src/components/charts/DistPlusPlot.re
index 587901af..ff30d06e 100644
--- a/src/components/charts/DistPlusPlot.re
+++ b/src/components/charts/DistPlusPlot.re
@@ -2,6 +2,7 @@ module DistPlusChart = {
   [@react.component]
   let make = (~distPlus: DistTypes.distPlus, ~onHover) => {
     open Distributions.DistPlus;
+    // todo: Change to scaledContinuous and scaledDiscrete
     let discrete = distPlus |> T.toDiscrete;
     let continuous =
       distPlus