diff --git a/frontend/src/components/redirect/index.js b/frontend/src/components/redirect/index.js
index bfc71d3e..06813aa8 100644
--- a/frontend/src/components/redirect/index.js
+++ b/frontend/src/components/redirect/index.js
@@ -5,8 +5,6 @@ const {
   Redirect
 } = ReactRouter;
 
-module.exports = (to) => () => {
-  return (
-    <Redirect to={to} />
-  );
-};
+module.exports = (to) => () => (
+  <Redirect to={to} />
+);
diff --git a/frontend/src/components/section/index.js b/frontend/src/components/section/index.js
index 4ccfde16..a4579555 100644
--- a/frontend/src/components/section/index.js
+++ b/frontend/src/components/section/index.js
@@ -30,6 +30,10 @@ const Section = ({
   ));
 
   const nameLinks = flatten(name.map((part, i) => {
+    if (!part.name) {
+      return null;
+    }
+
     const link = (
       <Link key={part.pathname} to={part.pathname}>
         {part.name}
diff --git a/frontend/src/containers/project/section.js b/frontend/src/containers/project/section.js
index 2362a783..cc7ab6fd 100644
--- a/frontend/src/containers/project/section.js
+++ b/frontend/src/containers/project/section.js
@@ -15,7 +15,7 @@ const {
   projectSectionsSelector
 } = selectors;
 
-const OrgSection = ({
+const ProjectSection = ({
   children,
   org = {},
   project = {},
@@ -49,7 +49,7 @@ const OrgSection = ({
   );
 };
 
-OrgSection.propTypes = {
+ProjectSection.propTypes = {
   children: React.PropTypes.node,
   org: PropTypes.org,
   project: PropTypes.project,
@@ -66,4 +66,4 @@ const mapStateToProps = (state, {
 
 module.exports = connect(
   mapStateToProps
-)(OrgSection);
+)(ProjectSection);
diff --git a/frontend/test/components/project-section.js b/frontend/test/components/project-section.js
new file mode 100644
index 00000000..f67c4e0c
--- /dev/null
+++ b/frontend/test/components/project-section.js
@@ -0,0 +1,19 @@
+const test = require('ava');
+const enzyme = require('enzyme');
+const React = require('react');
+
+const create = require('../helpers/create');
+
+const {
+  render
+} = enzyme;
+
+const {
+  withIntl
+} = create;
+
+test('renders <ProjectSection> without exploding', (t) => {
+  const Section = require('@containers/project/section').WrappedComponent;
+  const wrapper = render(withIntl(<Section />));
+  t.deepEqual(wrapper.length, 1);
+});
diff --git a/frontend/test/components/service.js b/frontend/test/components/service.js
new file mode 100644
index 00000000..ce66f865
--- /dev/null
+++ b/frontend/test/components/service.js
@@ -0,0 +1,25 @@
+const test = require('ava');
+const enzyme = require('enzyme');
+const React = require('react');
+
+const create = require('../helpers/create');
+
+const {
+  render
+} = enzyme;
+
+const {
+  withIntl
+} = create;
+
+test('renders <Service> without exploding', (t) => {
+  const Service = require('@containers/service').WrappedComponent;
+  const wrapper = render(withIntl(<Service />));
+  t.deepEqual(wrapper.length, 1);
+});
+
+test('renders connected <Service> without exploding', (t) => {
+  const Service = require('@containers/service');
+  const wrapper = render(create(<Service />));
+  t.deepEqual(wrapper.length, 1);
+});
diff --git a/frontend/test/components/services.js b/frontend/test/components/services.js
new file mode 100644
index 00000000..3c4f3a34
--- /dev/null
+++ b/frontend/test/components/services.js
@@ -0,0 +1,25 @@
+const test = require('ava');
+const enzyme = require('enzyme');
+const React = require('react');
+
+const create = require('../helpers/create');
+
+const {
+  render
+} = enzyme;
+
+const {
+  withIntl
+} = create;
+
+test('renders <Services> without exploding', (t) => {
+  const Services = require('@containers/services').WrappedComponent;
+  const wrapper = render(withIntl(<Services />));
+  t.deepEqual(wrapper.length, 1);
+});
+
+test('renders connected <Services> without exploding', (t) => {
+  const Services = require('@containers/services');
+  const wrapper = render(create(<Services />));
+  t.deepEqual(wrapper.length, 1);
+});