diff --git a/App/Components/MessageThreads.js b/App/Components/MessageThreads.js
index f7436f3f..86ec2f54 100644
--- a/App/Components/MessageThreads.js
+++ b/App/Components/MessageThreads.js
@@ -15,6 +15,7 @@ import api from './../Lib/Api';
 
 const styles = StyleSheet.create({
   container: {
+    flex: 1,
     height: 500,
     marginTop: 65,
   },
diff --git a/App/Components/__tests__/Main.test.js b/App/Components/__tests__/Main.test.js
new file mode 100644
index 00000000..341ba1fe
--- /dev/null
+++ b/App/Components/__tests__/Main.test.js
@@ -0,0 +1,13 @@
+import React, {Text, TextInput, TouchableHighlight} from 'react-native';
+import {shallow} from 'enzyme';
+import Main from '../Main';
+import {expect} from 'chai';
+
+describe('<Main />', () => {
+  it('should render Main component', () => {
+    const component = shallow(<Main />);
+    expect(component).to.exists
+  });
+});
+
+
diff --git a/App/Components/__tests__/MessagesThreads.test.js b/App/Components/__tests__/MessagesThreads.test.js
new file mode 100644
index 00000000..024477b9
--- /dev/null
+++ b/App/Components/__tests__/MessagesThreads.test.js
@@ -0,0 +1,13 @@
+import React, {Text, TextInput, TouchableHighlight} from 'react-native';
+import {shallow} from 'enzyme';
+import MessageThreads from '../MessageThreads';
+import {expect} from 'chai';
+
+describe('<MessageThreads />', () => {
+  it('should render MessageThreads component', () => {
+    const component = shallow(<MessageThreads />);
+    expect(component).to.exists
+  });
+});
+
+
diff --git a/App/Components/__tests__/NewMessageForm.test.js b/App/Components/__tests__/NewMessageForm.test.js
new file mode 100644
index 00000000..22931537
--- /dev/null
+++ b/App/Components/__tests__/NewMessageForm.test.js
@@ -0,0 +1,13 @@
+import React, {Text, TextInput, TouchableHighlight} from 'react-native';
+import {shallow} from 'enzyme';
+import NewMessageForm from '../NewMessageForm';
+import {expect} from 'chai';
+
+describe('<NewMessageForm />', () => {
+  it('should render NewMessageForm', () => {
+    const component = shallow(<NewMessageForm />);
+    expect(component).to.exists
+  });
+});
+
+
diff --git a/App/Components/__tests__/Settings.test.js b/App/Components/__tests__/Settings.test.js
new file mode 100644
index 00000000..e38273be
--- /dev/null
+++ b/App/Components/__tests__/Settings.test.js
@@ -0,0 +1,13 @@
+import React, {Text, TextInput, TouchableHighlight} from 'react-native';
+import {shallow} from 'enzyme';
+import Settings from '../Settings';
+import {expect} from 'chai';
+
+describe('<Settings />', () => {
+  it('should render Settings component', () => {
+    const component = shallow(<Settings />);
+    expect(component).to.exists
+  });
+});
+
+
diff --git a/App/Components/__tests__/ViewMessages.test.js b/App/Components/__tests__/ViewMessages.test.js
new file mode 100644
index 00000000..c1decc64
--- /dev/null
+++ b/App/Components/__tests__/ViewMessages.test.js
@@ -0,0 +1,12 @@
+import React, {Text, TextInput, TouchableHighlight} from 'react-native';
+import {shallow} from 'enzyme';
+import ViewMessages from '../ViewMessages';
+import {expect} from 'chai';
+
+describe('<ViewMessages />', () => {
+  it('should render ViewMessages component', () => {
+    const component = shallow(<ViewMessages />);
+    expect(component).to.exists
+  });
+});
+
diff --git a/package.json b/package.json
index 34ea8580..326372af 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,6 @@
     "react": "^0.14.8",
     "react-addons-test-utils": "^0.14.8",
     "react-dom": "^0.14.8",
-    "react-native-mock": "0.0.6"
+    "react-native-mock": "0.0.7"
   }
 }