diff --git a/packages/treemap/src/TreeMapHtmlNode.tsx b/packages/treemap/src/TreeMapHtmlNode.tsx
index 418d31b30e..32918c1d79 100644
--- a/packages/treemap/src/TreeMapHtmlNode.tsx
+++ b/packages/treemap/src/TreeMapHtmlNode.tsx
@@ -23,6 +23,7 @@ const NonMemoizedTreeMapHtmlNode = <Datum extends object>({
 
     return (
         <animated.div
+            data-testid={`node.${node.id}`}
             id={node.path.replace(/[^\w]/gi, '-')}
             style={{
                 boxSizing: 'border-box',
@@ -56,6 +57,7 @@ const NonMemoizedTreeMapHtmlNode = <Datum extends object>({
             />
             {showLabel && (
                 <animated.span
+                    data-testid={`label.${node.id}`}
                     style={{
                         ...theme.labels.text,
                         position: 'absolute',
@@ -83,6 +85,7 @@ const NonMemoizedTreeMapHtmlNode = <Datum extends object>({
             )}
             {showParentLabel && (
                 <animated.span
+                    data-testid={`parentLabel.${node.id}`}
                     style={{
                         ...theme.labels.text,
                         position: 'absolute',
diff --git a/packages/treemap/src/TreeMapNode.tsx b/packages/treemap/src/TreeMapNode.tsx
index 35a6fa8a9d..37d099aeff 100644
--- a/packages/treemap/src/TreeMapNode.tsx
+++ b/packages/treemap/src/TreeMapNode.tsx
@@ -24,6 +24,7 @@ const NonMemoizedTreeMapNode = <Datum extends object>({
     return (
         <animated.g transform={svgNodeTransform(animatedProps.x, animatedProps.y)}>
             <animated.rect
+                data-testid={`node.${node.id}`}
                 width={to(animatedProps.width, v => Math.max(v, 0))}
                 height={to(animatedProps.height, v => Math.max(v, 0))}
                 fill={node.fill ? node.fill : animatedProps.color}
@@ -37,6 +38,7 @@ const NonMemoizedTreeMapNode = <Datum extends object>({
             />
             {showLabel && (
                 <animated.text
+                    data-testid={`label.${node.id}`}
                     textAnchor="middle"
                     dominantBaseline="central"
                     style={{
@@ -56,6 +58,7 @@ const NonMemoizedTreeMapNode = <Datum extends object>({
             )}
             {showParentLabel && (
                 <animated.text
+                    data-testid={`parentLabel.${node.id}`}
                     dominantBaseline="central"
                     style={{
                         ...theme.labels.text,
diff --git a/packages/treemap/tests/TreeMap.test.tsx b/packages/treemap/tests/TreeMap.test.tsx
index 04623da2e5..a92147e84d 100644
--- a/packages/treemap/tests/TreeMap.test.tsx
+++ b/packages/treemap/tests/TreeMap.test.tsx
@@ -4,28 +4,26 @@ import {
     TreeMap,
     TreeMapSvgProps,
     DefaultTreeMapDatum,
+    NodeProps,
+    svgDefaultProps,
+    TooltipProps,
     // @ts-ignore
 } from '../src'
 
+const nodes = [
+    { id: 'root', sum: 100 },
+    { id: 'A', value: 50 },
+    { id: 'B', sum: 50 },
+    { id: 'B.0', value: 25 },
+    { id: 'B.1', value: 25 },
+]
 const sampleData: DefaultTreeMapDatum = {
-    id: 'root',
+    ...nodes[0],
     children: [
+        nodes[1],
         {
-            id: 'A',
-            value: 50,
-        },
-        {
-            id: 'B',
-            children: [
-                {
-                    id: 'B.0',
-                    value: 25,
-                },
-                {
-                    id: 'B.1',
-                    value: 25,
-                },
-            ],
+            ...nodes[2],
+            children: [nodes[3], nodes[4]],
         },
     ],
 }
@@ -45,308 +43,81 @@ afterAll(() => {
     Globals.assign({ skipAnimation: false })
 })
 
-it('should render a basic treemap chart', () => {})
+it('should render a basic treemap chart', () => {
+    const wrapper = mount(<TreeMap {...baseProps} />)
 
-/*
-it('should render a basic network chart', () => {
-    const wrapper = mount(<Network {...baseProps} />)
-
-    sampleData.nodes.forEach(node => {
-        const nodeElement = wrapper.find(`circle[data-testid='node.${node.id}']`)
+    nodes.forEach(node => {
+        const nodeElement = wrapper.find(`rect[data-testid='node.${node.id}']`)
         expect(nodeElement.exists()).toBeTruthy()
-    })
 
-    sampleData.links.forEach(link => {
-        const linkElement = wrapper.find(`line[data-testid='link.${link.source}.${link.target}']`)
-        expect(linkElement.exists()).toBeTruthy()
+        if (node.value !== undefined) {
+            const label = wrapper.find(`text[data-testid='label.${node.id}']`)
+            expect(label.exists()).toBeTruthy()
+            expect(label.text()).toEqual(`${node.value}`)
+        } else {
+            const parentLabel = wrapper.find(`text[data-testid='parentLabel.${node.id}']`)
+            expect(parentLabel.exists()).toBeTruthy()
+            expect(parentLabel.text()).toEqual(node.id)
+        }
     })
 })
 
 describe('nodes', () => {
-    it('static node color', () => {
-        const color = 'rgba(255, 0, 255, 1)'
-        const wrapper = mount(<Network {...baseProps} nodeColor={color} />)
-
-        sampleData.nodes.forEach(node => {
-            expect(wrapper.find(`circle[data-testid='node.${node.id}']`).prop('fill')).toEqual(
-                color
-            )
-        })
-    })
-
-    it('static node size', () => {
-        const size = 32
-        const wrapper = mount(<Network {...baseProps} nodeSize={size} />)
-
-        sampleData.nodes.forEach(node => {
-            expect(wrapper.find(`circle[data-testid='node.${node.id}']`).prop('r')).toEqual(
-                size / 2
-            )
-        })
-    })
-
-    it('dynamic node size', () => {
-        const computeSize = (node: { id: string; index: number }) => 10 + node.index * 2
-        const nodesWithIndex = sampleData.nodes.map((node, index) => ({
-            ...node,
-            index,
-        }))
-        const wrapper = mount(
-            <Network<{ id: string; index: number }, InputLink>
-                {...baseProps}
-                data={{
-                    nodes: nodesWithIndex,
-                    links: sampleData.links,
-                }}
-                nodeSize={computeSize}
-            />
-        )
-
-        nodesWithIndex.forEach(node => {
-            expect(wrapper.find(`circle[data-testid='node.${node.id}']`).prop('r')).toEqual(
-                computeSize(node) / 2
-            )
-        })
-    })
-
     it('custom node component', () => {
-        const CustomNode = ({ node }: NodeProps<InputNode>) => (
+        const CustomNode = ({ node }: NodeProps<DefaultTreeMapDatum>) => (
             <g data-testid={`node.${node.id}.custom`} />
         )
+        const wrapper = mount(<TreeMap {...baseProps} nodeComponent={CustomNode} />)
 
-        const wrapper = mount(<Network {...baseProps} nodeComponent={CustomNode} />)
-
-        sampleData.nodes.forEach(node => {
+        nodes.forEach(node => {
             expect(wrapper.find(`g[data-testid='node.${node.id}.custom']`).exists()).toBeTruthy()
         })
     })
 })
 
-describe('active/inactive nodes', () => {
-    it('styles depending on nodes status', () => {
-        const wrapper = mount(
-            <Network {...baseProps} nodeSize={10} activeNodeSize={20} inactiveNodeSize={0} />
-        )
-
-        sampleData.nodes.forEach(activeNode => {
-            wrapper.find(`circle[data-testid='node.${activeNode.id}']`).simulate('mouseenter')
-
-            expect(
-                wrapper.find(`circle[data-testid='node.${activeNode.id}']`).parent().prop('r').get()
-            ).toEqual(10)
-
-            sampleData.nodes
-                .filter(node => node.id !== activeNode.id)
-                .forEach(otherNode => {
-                    expect(
-                        wrapper
-                            .find(`circle[data-testid='node.${otherNode.id}']`)
-                            .parent()
-                            .prop('r')
-                            .get()
-                    ).toEqual(0)
-                })
-        })
-    })
-
-    it('default active node ids', () => {
-        const activeIds = ['A', 'C']
-        const wrapper = mount(
-            <Network
-                {...baseProps}
-                nodeSize={10}
-                activeNodeSize={20}
-                inactiveNodeSize={0}
-                defaultActiveNodeIds={activeIds}
-            />
-        )
-
-        sampleData.nodes.forEach(node => {
-            const nodeElement = wrapper.find(`circle[data-testid='node.${node.id}']`)
-
-            if (activeIds.includes(node.id)) {
-                expect(nodeElement.prop('r')).toEqual(10)
-            } else {
-                expect(nodeElement.prop('r')).toEqual(0)
-            }
-        })
-    })
-
-    it('ignored if non interactive', () => {
-        const wrapper = mount(
-            <Network
-                {...baseProps}
-                nodeSize={10}
-                activeNodeSize={20}
-                inactiveNodeSize={0}
-                defaultActiveNodeIds={['B', 'D']}
-                isInteractive={false}
-            />
-        )
-
-        sampleData.nodes.forEach(node => {
-            expect(wrapper.find(`circle[data-testid='node.${node.id}']`).prop('r')).toEqual(5)
-        })
-    })
-})
-
-describe('links', () => {
-    it('static link thickness', () => {
-        const wrapper = mount(<Network {...baseProps} linkThickness={3} />)
-
-        sampleData.links.forEach(link => {
-            expect(
-                wrapper
-                    .find(`line[data-testid='link.${link.source}.${link.target}']`)
-                    .prop('strokeWidth')
-            ).toEqual(3)
-        })
-    })
-
-    it('dynamic link thickness', () => {
-        const wrapper = mount(<Network {...baseProps} linkThickness={link => 1 + link.index} />)
-
-        sampleData.links.forEach((link, index) => {
-            expect(
-                wrapper
-                    .find(`line[data-testid='link.${link.source}.${link.target}']`)
-                    .prop('strokeWidth')
-            ).toEqual(1 + index)
-        })
-    })
-
-    it('static link color', () => {
-        const color = 'rgba(255, 0, 0, 1)'
-        const wrapper = mount(<Network {...baseProps} linkColor={color} />)
-
-        sampleData.links.forEach(link => {
-            expect(
-                wrapper
-                    .find(`line[data-testid='link.${link.source}.${link.target}']`)
-                    .prop('stroke')
-            ).toEqual(color)
-        })
-    })
-
-    it('dynamic link color', () => {
-        const wrapper = mount(
-            <Network {...baseProps} linkColor={link => `rgba(${link.index * 10}, 0, 0, 1)`} />
-        )
-
-        sampleData.links.forEach((link, index) => {
-            expect(
-                wrapper
-                    .find(`line[data-testid='link.${link.source}.${link.target}']`)
-                    .prop('stroke')
-            ).toEqual(`rgba(${index * 10}, 0, 0, 1)`)
-        })
-    })
-
-    it('link color from source node color', () => {
-        const color = 'rgba(125, 255, 125, 1)'
-        const wrapper = mount(
-            <Network
-                {...baseProps}
-                nodeColor={color}
-                linkColor={{
-                    from: 'source.color',
-                }}
-            />
-        )
-
-        sampleData.links.forEach(link => {
-            expect(
-                wrapper
-                    .find(`line[data-testid='link.${link.source}.${link.target}']`)
-                    .prop('stroke')
-            ).toEqual(color)
-        })
-    })
-
-    it('link color from target node color', () => {
-        const color = 'rgba(125, 125, 255, 1)'
-        const wrapper = mount(
-            <Network
-                {...baseProps}
-                nodeColor={color}
-                linkColor={{
-                    from: 'target.color',
-                }}
-            />
-        )
-
-        sampleData.links.forEach(link => {
-            expect(
-                wrapper
-                    .find(`line[data-testid='link.${link.source}.${link.target}']`)
-                    .prop('stroke')
-            ).toEqual(color)
-        })
-    })
-
-    it('link blend mode', () => {
-        const wrapper = mount(<Network {...baseProps} linkBlendMode="multiply" />)
-
-        sampleData.links.forEach(link => {
-            expect(
-                wrapper.find(`line[data-testid='link.${link.source}.${link.target}']`).prop('style')
-            ).toEqual({ mixBlendMode: 'multiply' })
-        })
-    })
-
-    it('custom link component', () => {
-        const CustomLink = ({ link }: LinkProps<InputNode, InputLink>) => (
-            <g data-testid={`link.${link.source.id}.${link.target.id}.custom`} />
-        )
-
-        const wrapper = mount(<Network {...baseProps} linkComponent={CustomLink} />)
-
-        sampleData.links.forEach(link => {
-            expect(
-                wrapper.find(`g[data-testid='link.${link.source}.${link.target}.custom']`).exists()
-            ).toBeTruthy()
-        })
-    })
-})
-
 describe('tooltip', () => {
     it('default node tooltip', () => {
-        const wrapper = mount(<Network {...baseProps} />)
+        const wrapper = mount(<TreeMap {...baseProps} />)
 
-        sampleData.nodes.forEach(node => {
-            const nodeElement = wrapper.find(`circle[data-testid='node.${node.id}']`)
+        nodes.forEach(node => {
+            const nodeElement = wrapper.find(`rect[data-testid='node.${node.id}']`)
 
             nodeElement.simulate('mouseenter')
 
-            const tooltip = wrapper.find(svgDefaultProps.nodeTooltip).childAt(0).childAt(0)
+            const tooltip = wrapper.find(svgDefaultProps.tooltip).childAt(0).childAt(0)
             expect(tooltip.exists()).toBeTruthy()
-            expect(tooltip.text()).toEqual(node.id)
+
+            if (node.value !== undefined) {
+                expect(tooltip.text()).toEqual(`${node.id}: ${node.value}`)
+            } else {
+                expect(tooltip.text()).toEqual(`${node.id}: ${node.sum}`)
+            }
 
             nodeElement.simulate('mouseleave')
-            expect(wrapper.find(svgDefaultProps.nodeTooltip).children()).toHaveLength(0)
+            expect(wrapper.find(svgDefaultProps.tooltip).children()).toHaveLength(0)
         })
     })
 
     it('disabled if non interactive', () => {
-        const wrapper = mount(<Network {...baseProps} isInteractive={false} />)
+        const wrapper = mount(<TreeMap {...baseProps} isInteractive={false} />)
 
-        sampleData.nodes.forEach(node => {
-            const nodeElement = wrapper.find(`circle[data-testid='node.${node.id}']`)
+        nodes.forEach(node => {
+            const nodeElement = wrapper.find(`rect[data-testid='node.${node.id}']`)
 
             nodeElement.simulate('mouseenter')
 
-            expect(wrapper.find(svgDefaultProps.nodeTooltip).children()).toHaveLength(0)
+            expect(wrapper.find(svgDefaultProps.tooltip).children()).toHaveLength(0)
         })
     })
 
-    it('custom node tooltip', () => {
-        const CustomTooltip = ({ node }: { node: ComputedNode<InputNode> }) => (
+    it('custom tooltip', () => {
+        const CustomTooltip = ({ node }: TooltipProps<DefaultTreeMapDatum>) => (
             <div>Custom: {node.id}</div>
         )
-        const wrapper = mount(<Network {...baseProps} nodeTooltip={CustomTooltip} />)
+        const wrapper = mount(<TreeMap {...baseProps} tooltip={CustomTooltip} />)
 
-        sampleData.nodes.forEach(node => {
-            const nodeElement = wrapper.find(`circle[data-testid='node.${node.id}']`)
+        nodes.forEach(node => {
+            const nodeElement = wrapper.find(`rect[data-testid='node.${node.id}']`)
 
             nodeElement.simulate('mouseenter')
 
@@ -363,10 +134,10 @@ describe('tooltip', () => {
 describe('interactivity', () => {
     it('onClick', () => {
         const onClick = jest.fn()
-        const wrapper = mount(<Network {...baseProps} onClick={onClick} />)
+        const wrapper = mount(<TreeMap {...baseProps} onClick={onClick} />)
 
-        sampleData.nodes.forEach(node => {
-            wrapper.find(`circle[data-testid='node.${node.id}']`).simulate('click')
+        nodes.forEach(node => {
+            wrapper.find(`rect[data-testid='node.${node.id}']`).simulate('click')
 
             expect(onClick).toHaveBeenCalledTimes(1)
             const [datum] = onClick.mock.calls[0]
@@ -378,10 +149,10 @@ describe('interactivity', () => {
 
     it('onMouseEnter', () => {
         const onMouseEnter = jest.fn()
-        const wrapper = mount(<Network {...baseProps} onMouseEnter={onMouseEnter} />)
+        const wrapper = mount(<TreeMap {...baseProps} onMouseEnter={onMouseEnter} />)
 
-        sampleData.nodes.forEach(node => {
-            wrapper.find(`circle[data-testid='node.${node.id}']`).simulate('mouseenter')
+        nodes.forEach(node => {
+            wrapper.find(`rect[data-testid='node.${node.id}']`).simulate('mouseenter')
 
             expect(onMouseEnter).toHaveBeenCalledTimes(1)
             const [datum] = onMouseEnter.mock.calls[0]
@@ -393,10 +164,10 @@ describe('interactivity', () => {
 
     it('onMouseMove handler', () => {
         const onMouseMove = jest.fn()
-        const wrapper = mount(<Network {...baseProps} onMouseMove={onMouseMove} />)
+        const wrapper = mount(<TreeMap {...baseProps} onMouseMove={onMouseMove} />)
 
-        sampleData.nodes.forEach(node => {
-            wrapper.find(`circle[data-testid='node.${node.id}']`).simulate('mousemove')
+        nodes.forEach(node => {
+            wrapper.find(`rect[data-testid='node.${node.id}']`).simulate('mousemove')
 
             expect(onMouseMove).toHaveBeenCalledTimes(1)
             const [datum] = onMouseMove.mock.calls[0]
@@ -408,10 +179,10 @@ describe('interactivity', () => {
 
     it('onMouseLeave handler', () => {
         const onMouseLeave = jest.fn()
-        const wrapper = mount(<Network {...baseProps} onMouseLeave={onMouseLeave} />)
+        const wrapper = mount(<TreeMap {...baseProps} onMouseLeave={onMouseLeave} />)
 
-        sampleData.nodes.forEach(node => {
-            wrapper.find(`circle[data-testid='node.${node.id}']`).simulate('mouseleave')
+        nodes.forEach(node => {
+            wrapper.find(`rect[data-testid='node.${node.id}']`).simulate('mouseleave')
 
             expect(onMouseLeave).toHaveBeenCalledTimes(1)
             const [datum] = onMouseLeave.mock.calls[0]
@@ -428,7 +199,7 @@ describe('interactivity', () => {
         const onMouseLeave = jest.fn()
 
         const wrapper = mount(
-            <Network
+            <TreeMap
                 {...baseProps}
                 onClick={onClick}
                 onMouseEnter={onMouseEnter}
@@ -438,8 +209,8 @@ describe('interactivity', () => {
             />
         )
 
-        sampleData.nodes.forEach(node => {
-            const nodeElement = wrapper.find(`circle[data-testid='node.${node.id}']`)
+        nodes.forEach(node => {
+            const nodeElement = wrapper.find(`rect[data-testid='node.${node.id}']`)
 
             nodeElement.simulate('mouseenter')
             expect(onMouseEnter).not.toHaveBeenCalled()
@@ -457,68 +228,22 @@ describe('interactivity', () => {
 })
 
 describe('layers', () => {
-    it('custom order', () => {
-        const wrapper = mount(<Network {...baseProps} layers={['nodes', 'links']} />)
-
-        const layers = wrapper.find('svg > g').children()
-        expect(layers.at(0).is('NetworkNodes')).toBeTruthy()
-        expect(layers.at(1).is('NetworkLinks')).toBeTruthy()
-    })
-
     it('custom layer', () => {
         const CustomLayer = () => null
-        const wrapper = mount(<Network {...baseProps} layers={[CustomLayer]} />)
+        const wrapper = mount(<TreeMap {...baseProps} layers={[CustomLayer]} />)
 
         const customLayer = wrapper.find(CustomLayer)
         expect(customLayer.exists()).toBeTruthy()
 
         const customLayerProps = customLayer.props()
         expect(customLayerProps).toHaveProperty('nodes')
-        expect(customLayerProps).toHaveProperty('links')
-        expect(customLayerProps).toHaveProperty('activeNodeIds')
-        expect(customLayerProps).toHaveProperty('setActiveNodeIds')
-    })
-})
-
-describe('annotations', () => {
-    it('circle annotation using id', () => {
-        const annotatedNodeId = 'C'
-        const wrapper = mount(
-            <Network
-                {...baseProps}
-                annotations={[
-                    {
-                        type: 'circle',
-                        match: {
-                            id: annotatedNodeId,
-                        },
-                        note: 'Note',
-                        noteX: 160,
-                        noteY: 36,
-                    },
-                ]}
-            />
-        )
-
-        const annotation = wrapper.find(Annotation)
-        expect(annotation.exists()).toBeTruthy()
-
-        const annotatedNode = wrapper.find(`circle[data-testid='node.${annotatedNodeId}']`)
-        const [nodeX, nodeY] = Array.from(
-            annotatedNode.prop('transform').match(/translate\(([0-9.]+),([0-9.]+)\)/)
-        )
-            .slice(1)
-            .map(Number)
-
-        expect(annotation.find('circle').first().prop('cx')).toEqual(nodeX)
-        expect(annotation.find('circle').first().prop('cy')).toEqual(nodeY)
     })
 })
 
 describe('accessibility', () => {
     it('aria properties', () => {
         const wrapper = mount(
-            <Network
+            <TreeMap
                 {...baseProps}
                 ariaLabel="AriaLabel"
                 ariaLabelledBy="AriaLabelledBy"
@@ -533,4 +258,3 @@ describe('accessibility', () => {
         expect(svg.prop('aria-describedby')).toBe('AriaDescribedBy')
     })
 })
-*/