diff --git a/ui/src/components/avatar/index.js b/ui/src/components/avatar/index.js
index 4d6f48b7..12ccd5d7 100644
--- a/ui/src/components/avatar/index.js
+++ b/ui/src/components/avatar/index.js
@@ -7,7 +7,7 @@ const styles = require('./style.css');
 const Avatar = ({
   color,
   src,
-  name,
+  name = '',
   className,
   style
 }) => {
@@ -22,32 +22,26 @@ const Avatar = ({
     background: color
   };
 
-  const fill = () => {
-    if ( src ) {
-      return (
-        <img
-          alt={name}
-          className={styles.picture}
-          src={src}
-          style={style}
-        />
-      );
-    } else {
-      const letter = name.split('')[0];
-      return (
-        <p
-          className={styles.letter}
-          style={style}
-        >
-          {letter}
-        </p>
-      );
-    }
-  };
+  const letter = name.split('')[0];
+  const av = src ? (
+    <img
+      alt={name}
+      className={styles.picture}
+      src={src}
+      style={style}
+    />
+  ) : (
+    <p
+      className={styles.letter}
+      style={style}
+    >
+      {letter}
+    </p>
+  );
 
   return (
     <div className={cn} style={style}>
-      {fill()}
+      {av}
     </div>
   );
 };
diff --git a/ui/test/index.js b/ui/test/index.js
index 7895e316..235ad943 100644
--- a/ui/test/index.js
+++ b/ui/test/index.js
@@ -6,8 +6,38 @@ const {
   shallow
 } = enzyme;
 
+test('renders <Avatar> without exploding', (t) => {
+  const Avatar = require('../src/components/avatar');
+  const wrapper = shallow(<Avatar />);
+  t.deepEqual(wrapper.length, 1);
+});
+
 test('renders <Base> without exploding', (t) => {
   const Base = require('../src/components/base');
   const wrapper = shallow(<Base />);
   t.deepEqual(wrapper.length, 1);
 });
+
+test('renders <Button> without exploding', (t) => {
+  const Button = require('../src/components/button');
+  const wrapper = shallow(<Button />);
+  t.deepEqual(wrapper.length, 1);
+});
+
+test('renders <Checkbox> without exploding', (t) => {
+  const Checkbox = require('../src/components/checkbox');
+  const wrapper = shallow(<Checkbox />);
+  t.deepEqual(wrapper.length, 1);
+});
+
+test('renders <Column> without exploding', (t) => {
+  const Column = require('../src/components/column');
+  const wrapper = shallow(<Column />);
+  t.deepEqual(wrapper.length, 1);
+});
+
+test('renders <Container> without exploding', (t) => {
+  const Container = require('../src/components/container');
+  const wrapper = shallow(<Container />);
+  t.deepEqual(wrapper.length, 1);
+});
\ No newline at end of file