diff --git a/.pep8 b/.pep8
new file mode 100644
index 0000000..f32cb5a
--- /dev/null
+++ b/.pep8
@@ -0,0 +1,4 @@
+[pep8]
+ignore=E501
+max_line_length=119
+exclude=settings
diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 0000000..1745113
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,240 @@
+[MASTER]
+
+# Specify a configuration file.
+#rcfile=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Profiled execution.
+profile=no
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=migrations
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+
+[MESSAGES CONTROL]
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time. See also the "--disable" option for examples.
+#enable=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once).You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use"--disable=all --enable=classes
+# --disable=W"
+# I0011     locally-disabled   (module-level pylint overrides)
+# disabling ```duplicate-code``` due to 5 lines that are the same near the top of
+# both xblock files - of course these are similar because it is a core pattern to
+# use - if we separated out into a separate file, we'd have the 5 lines in a separate
+# file and have 2 import statements within each file to get back the stuff - pretty
+# useless warning in this specific case
+disable=I0011,W0232,duplicate-code
+
+
+[REPORTS]
+
+# Set the output format. Available formats are text, parseable, colorized, msvs
+# (visual studio) and html. You can also give a reporter class, eg
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+
+# Put messages in a separate file for each module / package specified on the
+# command line instead of printing them on stdout. Reports (if any) will be
+# written in a file name "pylint_global.[txt|html]".
+files-output=no
+
+# Tells whether to display a full report or only the messages
+reports=yes
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Add a comment according to your evaluation note. This is used by the global
+# evaluation report (RP0004).
+comment=no
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO
+
+
+[VARIABLES]
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching the beginning of the name of dummy variables
+# (i.e. not used).
+dummy-variables-rgx=_|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=SQLObject
+
+# When zope mode is activated, add a predefined set of Zope acquired attributes
+# to generated-members.
+zope=no
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E0201 when accessed. Python regular
+# expressions are accepted.
+generated-members=REQUEST,acl_users,aq_parent
+
+
+[BASIC]
+
+# Required attributes for module, separated by a comma
+required-attributes=
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=map,filter,apply,input
+
+# Regular expression which should only match correct function names
+function-rgx=[a-z_][a-z0-9_]{2,50}$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,k,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Regular expression which should only match functions or classes name which do
+# not require a docstring
+no-docstring-rgx=__.*__
+
+
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=120
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,string,TERMIOS,Bastion,rexec
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branchs=12
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+
+[CLASSES]
+
+# List of interface methods to ignore, separated by a comma. This is used for
+# instance to not check methods defines in Zope's Interface base class.
+ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..57058d1
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,19 @@
+language: python
+
+python:
+  - "2.7"
+
+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
+install:
+  - "pip install -r requirements.txt"
+  - "pip uninstall -y xblock-google-drive && python setup.py sdist && pip install dist/xblock-google-drive-0.1.tar.gz"
+
+script:
+  - DJANGO_SETTINGS_MODULE="settings" nosetests --with-coverage --cover-package="google_drive" --with-django
+  - pep8 --config=.pep8 google_drive
+  - pylint --rcfile=.pylintrc google_drive --report=no
+
+after_success: coveralls
diff --git a/README.md b/README.md
index 62d0fac..213860a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Google Drive & Calendar XBlock
+Google Drive & Calendar XBlock [![Build Status](https://travis-ci.org/edx-solutions/xblock-google-drive.svg?branch=master)](https://travis-ci.org/edx-solutions/xblock-google-drive)
 ------------------------------
 
 This XBlock allows embedding of Google documents and calendar,
@@ -61,6 +61,12 @@ If you want to run only the integration or the unit tests, append the directory
 $ DJANGO_SETTINGS_MODULE="settings" nosetests --with-django tests/unit
 ```
 
+To see the coverage, run the tests using the following command:
+
+```bash
+$ DJANGO_SETTINGS_MODULE="settings" nosetests --with-coverage --cover-package="google_drive" --with-django
+```
+
 If you have not installed the xblock-sdk in the active virtualenv,
 you might also have to prepend `PYTHONPATH=".:/path/to/xblock"` to the command above.
 (`/path/to/xblock` is the path to the xblock-sdk, where the workbench resides).
@@ -84,7 +90,7 @@ Analogically, validation takes place for embedded code of Google Drive File.
    Since error status codes start with 400, it's assumed that each status code that's larger than or equal to 400 states that file is invalid.
    If for any reason exception occurs while getting an HTTP response, error code is returned, thus overriding default signalization that is invoked by edx platform when the 500 status code is reported.
 
-a11y
+Accessibility (a11y)
 ----
 
 For users with a visual impairment:
@@ -108,3 +114,12 @@ License
 The Google Drive & Calendar XBlocks are available under the GNU Affero General
 Public License (AGPLv3).
 
+## Installation Troubleshooting
+On a Mac, some people have received errors when installing lxml, trying to find a specific header file for the compiler
+
+Try the following if you encounter a problem:
+```
+CPATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/libxml2 CFLAGS=-Qunused-arguments CPPFLAGS=-Qunused-arguments pip install lxml
+```
+
+
diff --git a/google_drive/__init__.py b/google_drive/__init__.py
index b2456b7..6fa04c4 100644
--- a/google_drive/__init__.py
+++ b/google_drive/__init__.py
@@ -1,2 +1,5 @@
+"""
+Google drive XBlocks
+"""
 from .google_docs import GoogleDocumentBlock
-from .google_calendar import GoogleCalendarBlock
\ No newline at end of file
+from .google_calendar import GoogleCalendarBlock
diff --git a/google_drive/google_calendar.py b/google_drive/google_calendar.py
index 021426c..a51e2a9 100644
--- a/google_drive/google_calendar.py
+++ b/google_drive/google_calendar.py
@@ -1,21 +1,29 @@
+""" Google Calendar XBlock implementation """
 # -*- coding: utf-8 -*-
 #
 
 # Imports ###########################################################
-
-import pkg_resources
-import textwrap
+import logging
 
 from xblock.core import XBlock
 from xblock.fields import Scope, String, Integer
 from xblock.fragment import Fragment
 
-from .utils import loader, AttrDict
 from xblockutils.publish_event import PublishEventMixin
+from xblockutils.resources import ResourceLoader
+
+LOG = logging.getLogger(__name__)
+RESOURCE_LOADER = ResourceLoader(__name__)
 
-# Classes ###########################################################
 
-class GoogleCalendarBlock(XBlock, PublishEventMixin):
+# Constants ###########################################################
+DEFAULT_CALENDAR_ID = "edx.org_lom804qe3ttspplj1bgeu1l3ak@group.calendar.google.com"
+CALENDAR_TEMPLATE = "/templates/html/google_calendar.html"
+CALENDAR_EDIT_TEMPLATE = "/templates/html/google_calendar_edit.html"
+
+
+# Classes ###########################################################
+class GoogleCalendarBlock(XBlock, PublishEventMixin):  # pylint: disable=too-many-ancestors
     """
     XBlock providing a google calendar view for a specific calendar
     """
@@ -28,9 +36,12 @@ class GoogleCalendarBlock(XBlock, PublishEventMixin):
 
     calendar_id = String(
         display_name="Public Calendar ID",
-        help="Google provides an ID for publicly available calendars. In the Google Calendar, open Settings and copy the ID from the Calendar Address section into this field.",
+        help=(
+            "Google provides an ID for publicly available calendars. In the Google Calendar, "
+            "open Settings and copy the ID from the Calendar Address section into this field."
+        ),
         scope=Scope.settings,
-        default="edx.org_lom804qe3ttspplj1bgeu1l3ak@group.calendar.google.com"
+        default=DEFAULT_CALENDAR_ID
     )
 
     default_view = Integer(
@@ -42,51 +53,62 @@ class GoogleCalendarBlock(XBlock, PublishEventMixin):
 
     views = [(0, 'Week'), (1, 'Month'), (2, 'Agenda')]
 
-    def student_view(self, context):
+    # Context argument is specified for xblocks, but we are not using herein
+    def student_view(self, context):  # pylint: disable=unused-argument
         """
         Player view, displayed to the student
         """
-
         fragment = Fragment()
 
-        view = self.views[self.default_view][1]
-
-        iframe = '<iframe src="https://www.google.com/calendar/embed?mode={}&amp;src={}&amp;showCalendars=0" title="{}"></iframe>'.format(view, self.calendar_id, self.display_name)
-
-        fragment.add_content(loader.render_template('/templates/html/google_calendar.html', {
-            "self": self,
-            "iframe": iframe
+        fragment.add_content(RESOURCE_LOADER.render_template(CALENDAR_TEMPLATE, {
+            "mode": self.views[self.default_view][1],
+            "src": self.calendar_id,
+            "title": self.display_name,
         }))
-        fragment.add_css(loader.load_unicode('public/css/google_calendar.css'))
-        fragment.add_javascript(loader.load_unicode('public/js/google_calendar.js'))
+        fragment.add_css(RESOURCE_LOADER.load_unicode('public/css/google_calendar.css'))
+        fragment.add_javascript(RESOURCE_LOADER.load_unicode('public/js/google_calendar.js'))
 
         fragment.initialize_js('GoogleCalendarBlock')
 
         return fragment
 
-    def studio_view(self, context):
+    # Context argument is specified for xblocks, but we are not using herein
+    def studio_view(self, context):  # pylint: disable=unused-argument
         """
         Editing view in Studio
         """
         fragment = Fragment()
-        fragment.add_content(loader.render_template('/templates/html/google_calendar_edit.html', {
+        # Need to access protected members of fields to get their default value
+        fragment.add_content(RESOURCE_LOADER.render_template(CALENDAR_EDIT_TEMPLATE, {
             'self': self,
-            'defaultName': self.fields['display_name']._default,
-            'defaultID': self.fields['calendar_id']._default
+            'defaultName': self.fields['display_name']._default,  # pylint: disable=protected-access
+            'defaultID': self.fields['calendar_id']._default  # pylint: disable=protected-access
         }))
-        fragment.add_javascript(loader.load_unicode('public/js/google_calendar_edit.js'))
-        fragment.add_css(loader.load_unicode('public/css/google_edit.css'))
+        fragment.add_javascript(RESOURCE_LOADER.load_unicode('public/js/google_calendar_edit.js'))
+        fragment.add_css(RESOURCE_LOADER.load_unicode('public/css/google_edit.css'))
 
         fragment.initialize_js('GoogleCalendarEditBlock')
 
         return fragment
 
+    # suffix argument is specified for xblocks, but we are not using herein
     @XBlock.json_handler
-    def studio_submit(self, submissions, suffix=''):
-
-        self.display_name = submissions['display_name']
-        self.calendar_id = submissions['calendar_id']
-        self.default_view = submissions['default_view']
+    def studio_submit(self, submissions, suffix=''):  # pylint: disable=unused-argument
+        """
+        Change the settings for this XBlock given by the Studio user
+        """
+        if not isinstance(submissions, dict):
+            LOG.error("submissions object from Studio is not a dict - %r", submissions)
+            return {
+                'result': 'error'
+            }
+
+        if 'display_name' in submissions:
+            self.display_name = submissions['display_name']
+        if 'calendar_id' in submissions:
+            self.calendar_id = submissions['calendar_id']
+        if 'default_view' in submissions:
+            self.default_view = submissions['default_view']
 
         return {
             'result': 'success',
diff --git a/google_drive/google_docs.py b/google_drive/google_docs.py
index 925e5d9..745b860 100644
--- a/google_drive/google_docs.py
+++ b/google_drive/google_docs.py
@@ -1,9 +1,11 @@
+"""
+Google Document XBlock implementation
+"""
 # -*- coding: utf-8 -*-
 #
 
 # Imports ###########################################################
-
-import pkg_resources
+import logging
 import textwrap
 import requests
 
@@ -11,12 +13,30 @@
 from xblock.fields import Scope, String
 from xblock.fragment import Fragment
 
-from .utils import loader, AttrDict
 from xblockutils.publish_event import PublishEventMixin
+from xblockutils.resources import ResourceLoader
 
-# Classes ###########################################################
+LOG = logging.getLogger(__name__)
+RESOURCE_LOADER = ResourceLoader(__name__)
+
+# Constants ###########################################################
+DEFAULT_EMBED_CODE = textwrap.dedent("""
+            <iframe
+                src="https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsGAlanSo7r9z55ualwQlj-ofBQ/embed?start=true&loop=true&delayms=10000"
+                frameborder="0"
+                width="960"
+                height="569"
+                allowfullscreen="true"
+                mozallowfullscreen="true"
+                webkitallowfullscreen="true">
+            </iframe>
+        """)
+DOCUMENT_TEMPLATE = "/templates/html/google_docs.html"
+DOCUMENT_EDIT_TEMPLATE = "/templates/html/google_docs_edit.html"
 
-class GoogleDocumentBlock(XBlock, PublishEventMixin):
+
+# Classes ###########################################################
+class GoogleDocumentBlock(XBlock, PublishEventMixin):  # pylint: disable=too-many-ancestors
     """
     XBlock providing a google document embed link
     """
@@ -29,81 +49,104 @@ class GoogleDocumentBlock(XBlock, PublishEventMixin):
 
     embed_code = String(
         display_name="Embed Code",
-        help="Google provides an embed code for Drive documents. In the Google Drive document, from the File menu, select Publish to the Web. Modify settings as needed, click Publish, and copy the embed code into this field.",
+        help=(
+            "Google provides an embed code for Drive documents. In the Google Drive document, "
+            "from the File menu, select Publish to the Web. Modify settings as needed, click "
+            "Publish, and copy the embed code into this field."
+        ),
         scope=Scope.settings,
-        default=textwrap.dedent("""
-            <iframe
-                src="https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsGAlanSo7r9z55ualwQlj-ofBQ/embed?start=true&loop=true&delayms=10000"
-                frameborder="0"
-                width="960"
-                height="569"
-                allowfullscreen="true"
-                mozallowfullscreen="true"
-                webkitallowfullscreen="true">
-            </iframe>
-        """))
+        default=DEFAULT_EMBED_CODE
+    )
 
     alt_text = String(
         display_name="Alternative Text",
-        help="In situations where image is not available to the reader, the alternative text ensures that no information or functionality is lost.",
+        help=(
+            "In situations where image is not available to the reader, the alternative "
+            "text ensures that no information or functionality is lost."
+        ),
         scope=Scope.settings,
         default=""
     )
 
-    def student_view(self, context):
+    # Context argument is specified for xblocks, but we are not using herein
+    def student_view(self, context):  # pylint: disable=unused-argument
         """
         Player view, displayed to the student
         """
-
         fragment = Fragment()
 
-        fragment.add_content(loader.render_template('/templates/html/google_docs.html', {"self": self}))
-        fragment.add_css(loader.load_unicode('public/css/google_docs.css'))
-        fragment.add_javascript(loader.load_unicode('public/js/google_docs.js'))
+        fragment.add_content(RESOURCE_LOADER.render_template(DOCUMENT_TEMPLATE, {"self": self}))
+        fragment.add_css(RESOURCE_LOADER.load_unicode('public/css/google_docs.css'))
+        fragment.add_javascript(RESOURCE_LOADER.load_unicode('public/js/google_docs.js'))
 
         fragment.initialize_js('GoogleDocumentBlock')
 
         return fragment
 
-    def studio_view(self, context):
+    # Context argument is specified for xblocks, but we are not using herein
+    def studio_view(self, context):  # pylint: disable=unused-argument
         """
         Editing view in Studio
         """
         fragment = Fragment()
-        fragment.add_content(loader.render_template('/templates/html/google_docs_edit.html', {
+        # Need to access protected members of fields to get their default value
+        fragment.add_content(RESOURCE_LOADER.render_template(DOCUMENT_EDIT_TEMPLATE, {
             'self': self,
-            'defaultName': self.fields['display_name']._default
+            'defaultName': self.fields['display_name']._default  # pylint: disable=protected-access
         }))
-        fragment.add_javascript(loader.load_unicode('public/js/google_docs_edit.js'))
-        fragment.add_css(loader.load_unicode('public/css/google_edit.css'))
+        fragment.add_javascript(RESOURCE_LOADER.load_unicode('public/js/google_docs_edit.js'))
+        fragment.add_css(RESOURCE_LOADER.load_unicode('public/css/google_edit.css'))
 
         fragment.initialize_js('GoogleDocumentEditBlock')
 
         return fragment
 
+    # suffix argument is specified for xblocks, but we are not using herein
     @XBlock.json_handler
-    def studio_submit(self, submissions, suffix=''):
+    def studio_submit(self, submissions, suffix=''):  # pylint: disable=unused-argument
+        """
+        Change the settings for this XBlock given by the Studio user
+        """
+        if not isinstance(submissions, dict):
+            LOG.error("submissions object from Studio is not a dict - %r", submissions)
+            return {
+                'result': 'error'
+            }
 
-        self.display_name = submissions['display_name']
-        self.embed_code = submissions['embed_code']
-        self.alt_text = submissions['alt_text']
+        if 'display_name' in submissions:
+            self.display_name = submissions['display_name']
+        if 'embed_code' in submissions:
+            self.embed_code = submissions['embed_code']
+        if 'alt_text' in submissions:
+            self.alt_text = submissions['alt_text']
 
         return {
             'result': 'success',
         }
 
+    # suffix argument is specified for xblocks, but we are not using herein
     @XBlock.json_handler
-    def check_url(self, data, suffix=''):
-
+    def check_url(self, data, suffix=''):  # pylint: disable=unused-argument,no-self-use
+        """
+        Checks that the given document url is accessible, and therefore assumed to be valid
+        """
         try:
-            r = requests.head(data['url'])
-        except:
+            test_url = data['url']
+            url_response = requests.head(test_url)
+        except KeyError as ex:
+            LOG.debug("URL not provided - %s", unicode(ex))
+            return {
+                'status_code': 400,
+            }
+        # Catch wide range of request exceptions
+        except requests.exceptions.RequestException as ex:
+            LOG.debug("Unable to connect to %s - %s", test_url, unicode(ex))
             return {
                 'status_code': 400,
             }
 
         return {
-            'status_code': r.status_code,
+            'status_code': url_response.status_code,
         }
 
     @staticmethod
diff --git a/google_drive/public/js/google_calendar.js b/google_drive/public/js/google_calendar.js
index 24bbd70..373c9e3 100644
--- a/google_drive/public/js/google_calendar.js
+++ b/google_drive/public/js/google_calendar.js
@@ -1,6 +1,5 @@
 /* Javascript for GoogleDocumentBlock. */
 function GoogleCalendarBlock(runtime, element) {
-
     $('iframe', element).load(function(){
         var iframe_url = $(this).attr('src');
         $.ajax({
diff --git a/google_drive/public/js/google_docs.js b/google_drive/public/js/google_docs.js
index 2d0a144..227839c 100644
--- a/google_drive/public/js/google_docs.js
+++ b/google_drive/public/js/google_docs.js
@@ -1,6 +1,5 @@
 /* Javascript for GoogleDocumentBlock. */
 function GoogleDocumentBlock(runtime, element) {
-
     var iframe = $('iframe', element);
     var image = $('img', element);
     var xblock_wrapper = $('.google-docs-xblock-wrapper', element);
diff --git a/google_drive/public/js/google_docs_edit.js b/google_drive/public/js/google_docs_edit.js
index e986fac..f495c00 100644
--- a/google_drive/public/js/google_docs_edit.js
+++ b/google_drive/public/js/google_docs_edit.js
@@ -1,5 +1,4 @@
 function GoogleDocumentEditBlock(runtime, element) {
-
     var clear_name_button = $('.clear-display-name', element);
     var save_button = $('.save-button', element);
     var validation_alert = $('.validation_alert', element);
diff --git a/google_drive/templates/html/google_calendar.html b/google_drive/templates/html/google_calendar.html
index 606de4d..894645b 100644
--- a/google_drive/templates/html/google_calendar.html
+++ b/google_drive/templates/html/google_calendar.html
@@ -1,4 +1,4 @@
 <div class="google-calendar-xblock-wrapper">
     <input type="hidden" class="load_event_complete">
-    {{ iframe|safe }}
+    <iframe src="https://www.google.com/calendar/embed?mode={{mode}}&amp;src={{src}}&amp;showCalendars=0" title="{{title}}"></iframe>
 </div>
diff --git a/google_drive/templates/html/google_calendar_edit.html b/google_drive/templates/html/google_calendar_edit.html
index 0a5f62b..669bb0b 100644
--- a/google_drive/templates/html/google_calendar_edit.html
+++ b/google_drive/templates/html/google_calendar_edit.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <!-- TODO: Replace by default edit view once available in Studio -->
-<div class="wrapper-comp-settings is-active editor-with-buttons google-edit-wrapper" id="settings-tab">
+<div class="wrapper-comp-settings is-active editor-with-buttons google-edit-wrapper" id="calendar-settings-tab">
   <div class="user-inputs-and-validation">
     <div class="validation_alert covered">
       <i class="alert_icon"></i>
@@ -17,7 +17,7 @@ <h2 class="alert_title">{% trans "Invalid Google Calendar" %}</h2>
               <label class="label setting-label" for="edit_display_name">{% trans "Display Name" %}</label>
               <input class="input setting-input edit-display-name" id="edit_display_name" value="{{ self.display_name }}" type="text" data-default-value="{{defaultName}}">
               <button class="action setting-clear clear-display-name" type="button" name="setting-clear">
-                <i class="icon-undo"></i>
+                <i class="icon fa fa-undo"></i>
                 <span class="sr">"<%= gettext("Clear Value") %>"</span>
               </button>
             </div>
@@ -28,7 +28,7 @@ <h2 class="alert_title">{% trans "Invalid Google Calendar" %}</h2>
               <label class="label setting-label" for="edit_calendar_id">{% trans "Public Calendar ID" %}</label>
               <input class="input setting-input edit-calendar-id" id="edit_calendar_id" value="{{ self.calendar_id }}" type="text" data-default-value="{{defaultID}}">
               <button class="action setting-clear clear-calendar-id" type="button" name="setting-clear">
-                <i class="icon-undo"></i>
+                <i class="icon fa fa-undo"></i>
                 <span class="sr">"<%= gettext("Clear Value") %>"</span>
               </button>
             </div>
@@ -57,7 +57,7 @@ <h2 class="alert_title">{% trans "Invalid Google Calendar" %}</h2>
     <span class="xblock-editor-error-message"></span>
     <ul>
       <li class="action-item">
-        <a href="#" class="button action-primary save-button">{% trans "Save" %}</a>
+        <a href="#" id="calendar-submit-options" class="button action-primary save-button">{% trans "Save" %}</a>
       </li>
 
       <li class="action-item">
diff --git a/google_drive/templates/html/google_docs_edit.html b/google_drive/templates/html/google_docs_edit.html
index 896bd84..d728463 100644
--- a/google_drive/templates/html/google_docs_edit.html
+++ b/google_drive/templates/html/google_docs_edit.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <!-- TODO: Replace by default edit view once available in Studio -->
-<div class="wrapper-comp-settings is-active editor-with-buttons google-edit-wrapper" id="settings-tab">
+<div class="wrapper-comp-settings is-active editor-with-buttons google-edit-wrapper" id="document-settings-tab">
   <div class="user-inputs-and-validation">
     <div class="validation_alert covered">
       <i class="alert_icon"></i>
@@ -17,7 +17,7 @@ <h2 class="alert_title">{% trans "Invalid Google Document" %}</h2>
             <label class="label setting-label" for="edit_display_name">{% trans "Display Name" %}</label>
             <input class="input setting-input edit-display-name" id="edit_display_name" value="{{ self.display_name }}" type="text" data-default-value="{{defaultName}}">
             <button class="action setting-clear clear-display-name" type="button" name="setting-clear">
-              <i class="icon-undo"></i>
+              <i class="icon fa fa-undo"></i>
               <span class="sr">"<%= gettext("Clear Value") %>"</span>
             </button>
           </div>
@@ -44,7 +44,7 @@ <h2 class="alert_title">{% trans "Invalid Google Document" %}</h2>
     <span class="xblock-editor-error-message"></span>
     <ul>
       <li class="action-item">
-        <a href="#" class="button action-primary save-button">{% trans "Save" %}</a>
+        <a href="#" id="document-submit-options" class="button action-primary save-button">{% trans "Save" %}</a>
       </li>
 
       <li class="action-item">
diff --git a/google_drive/tests/__init__.py b/google_drive/tests/__init__.py
new file mode 100644
index 0000000..418a32e
--- /dev/null
+++ b/google_drive/tests/__init__.py
@@ -0,0 +1 @@
+""" Unit and integration tests for google drive components """
diff --git a/google_drive/tests/integration/__init__.py b/google_drive/tests/integration/__init__.py
new file mode 100644
index 0000000..5a51f66
--- /dev/null
+++ b/google_drive/tests/integration/__init__.py
@@ -0,0 +1 @@
+""" Integration tests for google drive components """
diff --git a/google_drive/tests/integration/base_test.py b/google_drive/tests/integration/base_test.py
new file mode 100644
index 0000000..3f7ac45
--- /dev/null
+++ b/google_drive/tests/integration/base_test.py
@@ -0,0 +1,14 @@
+""" Base classes for integration tests """
+from xblockutils.base_test import SeleniumBaseTest
+
+
+class GoogleCalendarBaseTest(SeleniumBaseTest):  # pylint: disable=too-many-ancestors, too-few-public-methods
+    """ Base class for Google Calendar integration tests """
+    module_name = __name__
+    default_css_selector = 'div.google-calendar-xblock-wrapper'
+
+
+class GoogleDocumentBaseTest(SeleniumBaseTest):  # pylint: disable=too-many-ancestors, too-few-public-methods
+    """ Base class for Google Document integration tests """
+    module_name = __name__
+    default_css_selector = 'div.google-docs-xblock-wrapper'
diff --git a/google_drive/tests/integration/calendar_base_test.py b/google_drive/tests/integration/calendar_base_test.py
deleted file mode 100644
index 2e192ff..0000000
--- a/google_drive/tests/integration/calendar_base_test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from xblockutils.base_test import SeleniumBaseTest
-
-class GoogleCalendarBaseTest(SeleniumBaseTest):
-    module_name = __name__
-    default_css_selector = 'div.google-calendar-xblock-wrapper'
-
-    def test_calendar_publish_event(self):
-        calendar = self.go_to_page('Calendar')
-        load_event_complete = calendar.find_element_by_css_selector('.load_event_complete')
-        self.assertEqual(load_event_complete.get_attribute('value'), "I've published the event that indicates that the load has completed")
diff --git a/google_drive/tests/integration/document_base_test.py b/google_drive/tests/integration/document_base_test.py
deleted file mode 100644
index c08eb40..0000000
--- a/google_drive/tests/integration/document_base_test.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from xblockutils.base_test import SeleniumBaseTest
-
-class GoogleDocumentBaseTest(SeleniumBaseTest):
-    module_name = __name__
-    default_css_selector = 'div.google-docs-xblock-wrapper'
-
-    def test_document_publish_event(self):
-        document = self.go_to_page('Document')
-        load_event_complete = document.find_element_by_css_selector('.load_event_complete')
-        self.assertEqual(load_event_complete.get_attribute('value'), "I've published the event that indicates that the load has completed")
-
-    def test_image_publish_event(self):
-        image = self.go_to_page('Image')
-        load_event_complete = image.find_element_by_css_selector('.load_event_complete')
-        self.assertEqual(load_event_complete.get_attribute('value'), "I've published the event that indicates that the load has completed")
diff --git a/google_drive/tests/integration/studio_scenarios.py b/google_drive/tests/integration/studio_scenarios.py
new file mode 100644
index 0000000..5baa121
--- /dev/null
+++ b/google_drive/tests/integration/studio_scenarios.py
@@ -0,0 +1,20 @@
+"""
+Contains a list of lists that will be used as the DDT arguments for the studio test.
+"""
+CALENDAR_SCENARIOS = [
+    [
+        'Calendar',
+    ],
+]
+
+DOCUMENT_SCENARIOS = [
+    [
+        'Document',
+    ],
+]
+
+IMAGE_SCENARIOS = [
+    [
+        'Image',
+    ],
+]
diff --git a/google_drive/tests/integration/test_publish.py b/google_drive/tests/integration/test_publish.py
new file mode 100644
index 0000000..e2128b8
--- /dev/null
+++ b/google_drive/tests/integration/test_publish.py
@@ -0,0 +1,41 @@
+""" Runs tests for publish event functionality """
+from .base_test import GoogleCalendarBaseTest, GoogleDocumentBaseTest
+
+
+class GoogleCalendarPublishTestCase(GoogleCalendarBaseTest):  # pylint: disable=too-few-public-methods, too-many-ancestors
+    """
+    Tests for Google Calendar event publishing functionality.
+    """
+
+    def test_calendar_publish_event(self):
+        """ Tests whether the publish event for calendar was triggered """
+        calendar = self.go_to_page('Calendar')
+        load_event_complete = calendar.find_element_by_css_selector('.load_event_complete')
+        self.assertEqual(
+            load_event_complete.get_attribute('value'),
+            "I've published the event that indicates that the load has completed"
+        )
+
+
+class GoogleDocumentPublishTestCase(GoogleDocumentBaseTest):  # pylint: disable=too-many-ancestors
+    """
+    Tests for Google Document event publishing functionality.
+    """
+
+    def test_document_publish_event(self):
+        """ Tests whether the publish event for document was triggered """
+        document = self.go_to_page('Document')
+        load_event_complete = document.find_element_by_css_selector('.load_event_complete')
+        self.assertEqual(
+            load_event_complete.get_attribute('value'),
+            "I've published the event that indicates that the load has completed"
+        )
+
+    def test_image_publish_event(self):
+        """ Tests whether the publish event for image was triggered """
+        image = self.go_to_page('Image')
+        load_event_complete = image.find_element_by_css_selector('.load_event_complete')
+        self.assertEqual(
+            load_event_complete.get_attribute('value'),
+            "I've published the event that indicates that the load has completed"
+        )
diff --git a/google_drive/tests/integration/test_studio.py b/google_drive/tests/integration/test_studio.py
new file mode 100644
index 0000000..dc904c8
--- /dev/null
+++ b/google_drive/tests/integration/test_studio.py
@@ -0,0 +1,135 @@
+""" Runs tests for the studio views """
+
+from ddt import ddt, unpack, data
+from .base_test import GoogleCalendarBaseTest, GoogleDocumentBaseTest
+from .studio_scenarios import CALENDAR_SCENARIOS, DOCUMENT_SCENARIOS, IMAGE_SCENARIOS
+
+DEFAULT_CALENDAR_SRC = (
+    'https://www.google.com/calendar/embed?'
+    'mode=Month&'
+    'src=edx.org_lom804qe3ttspplj1bgeu1l3ak@group.calendar.google.com&'
+    'showCalendars=0'
+)
+
+DEFAULT_DOCUMENT_SRC = (
+    'https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsGAlanSo7r9z55ualwQlj-ofBQ/embed?'
+    'start=true&loop=true&delayms=10000'
+)
+
+TEST_IMAGE_SRC = 'https://docs.google.com/drawings/d/1lmmxboBM5c_0WCTjhAxBdkpqQb3T8VSwtuG0TRR1ODQ/pub?w=960&h=720'
+
+
+@ddt  # pylint: disable=too-many-ancestors
+class GoogleCalendarStudioTest(GoogleCalendarBaseTest):
+    """
+    Tests for Google Calendar studio view.
+    """
+    default_css_selector = '#calendar-settings-tab'
+
+    def studio_save(self):
+        """ Save changes made in studio for Google Calendar """
+        self.browser.find_element_by_css_selector('#calendar-submit-options').click()
+
+    @data(*CALENDAR_SCENARIOS)  # pylint: disable=star-args
+    @unpack
+    def test_save_calendar(self, page_name):
+        """
+        Verify that option changes in Google Calendar studio view
+        are appropriately saved and visible immediately after
+        """
+        self.go_to_page(page_name, view_name='studio_view')
+        # Expecting every input value to be valid
+        self.assertTrue(self.browser.find_element_by_css_selector('.validation_alert.covered'))
+        display_name_input = self.browser.find_element_by_css_selector('#edit_display_name')
+        # Change display name
+        display_name_input.clear()
+        display_name_input.send_keys('My Meetings')
+        calendar_id_input = self.browser.find_element_by_css_selector('#edit_calendar_id')
+        # Change calendar ID
+        calendar_id_input.clear()
+        calendar_id_input.send_keys('a')
+        self.wait_until_exists('#edit_calendar_id.error')
+        # Expects validation error due to calendar ID being invalid
+        self.assertTrue(self.browser.find_element_by_css_selector('.validation_alert:not(covered)'))
+        # Check to see that calendar ID input element is marked as invalid
+        self.assertTrue(self.browser.find_element_by_css_selector('#edit_calendar_id.error'))
+        # Save button should be disabled
+        self.assertTrue(self.browser.find_element_by_css_selector('#calendar-submit-options.disabled'))
+        clean_calendar_id_button = self.browser.find_element_by_css_selector('button.clear-calendar-id')
+        # Reset calendar ID value to default one
+        clean_calendar_id_button.click()
+        # Expecting every input value to be valid again
+        self.assertTrue(self.browser.find_element_by_css_selector('.validation_alert.covered'))
+
+        self.studio_save()
+        self.go_to_page(page_name, css_selector='div.google-calendar-xblock-wrapper')
+        calendar_iframe = self.browser.find_element_by_css_selector('iframe')
+        # Expecting that default calendar is the one loaded in the IFrame
+        self.assertEqual(calendar_iframe.get_attribute("src"), DEFAULT_CALENDAR_SRC)
+        # Expecting that the new display name is the title of the IFrame
+        self.assertEqual(calendar_iframe.get_attribute("title"), 'My Meetings')
+
+
+@ddt  # pylint: disable=too-many-ancestors
+class GoogleDocumentStudioTest(GoogleDocumentBaseTest):
+    """
+    Tests for Google Document studio view.
+    """
+    default_css_selector = '#document-settings-tab'
+
+    def studio_save(self):
+        """ Save changes made in studio for Google Document """
+        self.browser.find_element_by_css_selector('#document-submit-options').click()
+
+    @data(*DOCUMENT_SCENARIOS)  # pylint: disable=star-args
+    @unpack
+    def test_save_document(self, page_name):
+        """
+        Verify that option changes in Google Document studio view
+        are appropriately saved and visible immediately after
+        """
+        self.go_to_page(page_name, view_name='studio_view')
+        # Expecting every input value to be valid
+        self.assertTrue(self.browser.find_element_by_css_selector('.validation_alert.covered'))
+        display_name_input = self.browser.find_element_by_css_selector('#edit_display_name')
+        # Change display name
+        display_name_input.clear()
+        display_name_input.send_keys('My Document')
+        # Expecting list item that contains input element for alternative text to be hidden
+        self.assertTrue(self.browser.find_element_by_css_selector('li#alt_text_item.covered'))
+
+        self.studio_save()
+        self.go_to_page(page_name, css_selector='div.google-docs-xblock-wrapper')
+        document_iframe = self.browser.find_element_by_css_selector('iframe')
+        # Expecting that default calendar is the one loaded in the IFrame
+        self.assertEqual(document_iframe.get_attribute("src"), DEFAULT_DOCUMENT_SRC)
+        # Expecting that the new display name is the title of the IFrame
+        self.assertEqual(document_iframe.get_attribute("title"), 'My Document')
+
+    @data(*IMAGE_SCENARIOS)  # pylint: disable=star-args
+    @unpack
+    def test_save_image(self, page_name):
+        """
+        Verify that option changes in Google Image studio view
+        are appropriately saved and visible immediately after
+        """
+        self.go_to_page(page_name, view_name='studio_view')
+        # Expecting every input value to be valid
+        self.assertTrue(self.browser.find_element_by_css_selector('.validation_alert.covered'))
+        display_name_input = self.browser.find_element_by_css_selector('#edit_display_name')
+        # Change display name
+        display_name_input.clear()
+        display_name_input.send_keys('My Image')
+        # Expecting list item that contains input element for alternative text to be shown
+        self.assertTrue(self.browser.find_element_by_css_selector('li#alt_text_item:not(covered)'))
+        alt_text_input = self.browser.find_element_by_css_selector('#edit_alt_text')
+        # Add alternative text for image
+        alt_text_input.send_keys('Alternative text for my image')
+
+        self.studio_save()
+        self.go_to_page(page_name, css_selector='div.google-docs-xblock-wrapper')
+        image_iframe = self.browser.find_element_by_css_selector('img')
+        # Expecting that default calendar is the one loaded in the IFrame
+        self.assertEqual(image_iframe.get_attribute("src"), TEST_IMAGE_SRC)
+        # Expecting that the new display name is the title of the IFrame
+        self.assertEqual(image_iframe.get_attribute("alt"), 'Alternative text for my image')
diff --git a/google_drive/tests/integration/xml/calendar.xml b/google_drive/tests/integration/xml/calendar.xml
index 80bf5b0..7b0761d 100644
--- a/google_drive/tests/integration/xml/calendar.xml
+++ b/google_drive/tests/integration/xml/calendar.xml
@@ -1,3 +1 @@
-<vertical_demo>
-    <google-calendar/>
-</vertical_demo>
+<google-calendar/>
diff --git a/google_drive/tests/integration/xml/document.xml b/google_drive/tests/integration/xml/document.xml
index 3072bf4..10c199c 100644
--- a/google_drive/tests/integration/xml/document.xml
+++ b/google_drive/tests/integration/xml/document.xml
@@ -1,3 +1 @@
-<vertical_demo>
-    <google-document/>
-</vertical_demo>
+<google-document/>
diff --git a/google_drive/tests/integration/xml/image.xml b/google_drive/tests/integration/xml/image.xml
index 5152350..54b5652 100644
--- a/google_drive/tests/integration/xml/image.xml
+++ b/google_drive/tests/integration/xml/image.xml
@@ -1,3 +1 @@
-<vertical_demo>
-    <google-document embed_code="&lt;img src='https://docs.google.com/drawings/d/1lmmxboBM5c_0WCTjhAxBdkpqQb3T8VSwtuG0TRR1ODQ/pub?w=960&amp;h=720'&gt;"/>
-</vertical_demo>
+<google-document embed_code="&lt;img src='https://docs.google.com/drawings/d/1lmmxboBM5c_0WCTjhAxBdkpqQb3T8VSwtuG0TRR1ODQ/pub?w=960&amp;h=720'&gt;"/>
diff --git a/google_drive/tests/unit/__init__.py b/google_drive/tests/unit/__init__.py
new file mode 100644
index 0000000..0306fef
--- /dev/null
+++ b/google_drive/tests/unit/__init__.py
@@ -0,0 +1 @@
+""" Unit tests for google drive components """
diff --git a/google_drive/tests/unit/test_calendar.py b/google_drive/tests/unit/test_calendar.py
new file mode 100644
index 0000000..a67a8c8
--- /dev/null
+++ b/google_drive/tests/unit/test_calendar.py
@@ -0,0 +1,102 @@
+""" Unit tests for google document components """
+import json
+import unittest
+from mock import Mock
+
+from nose.tools import assert_equals, assert_in
+from workbench.runtime import WorkbenchRuntime
+from xblock.runtime import KvsFieldData, DictKeyValueStore
+
+from google_drive import GoogleCalendarBlock
+from google_drive.tests.unit.test_utils import generate_scope_ids, make_request
+
+
+class TestGoogleCalendarBlock(unittest.TestCase):
+    """ Tests for GoogleCalendarBlock """
+
+    @classmethod
+    def make_calendar_block(cls):
+        """ helper to construct a GoogleCalendarBlock """
+        runtime = WorkbenchRuntime()
+        key_store = DictKeyValueStore()
+        db_model = KvsFieldData(key_store)
+        ids = generate_scope_ids(runtime, 'google_calendar')
+        return GoogleCalendarBlock(runtime, db_model, scope_ids=ids)
+
+    def test_calendar_template_content(self):  # pylint: disable=no-self-use
+        """ Test content of GoogleCalendarBlock's rendered views """
+        block = TestGoogleCalendarBlock.make_calendar_block()
+        block.usage_id = Mock()
+
+        student_fragment = block.render('student_view', Mock())
+        # pylint: disable=no-value-for-parameter
+        assert_in('<div class="google-calendar-xblock-wrapper">', student_fragment.content)
+        assert_in(
+            (
+                'https://www.google.com/calendar/embed?mode=Month&amp;src=edx.org_lom804qe3ttspplj1bgeu1l3ak'
+                '@group.calendar.google.com&amp;showCalendars=0'
+            ),
+            student_fragment.content
+        )
+        assert_in('Google Calendar', student_fragment.content)
+
+        studio_fragment = block.render('studio_view', Mock())
+        assert_in(
+            (
+                '<div class="wrapper-comp-settings is-active editor-with-buttons google-edit-wrapper" '
+                'id="calendar-settings-tab">'
+            ),
+            studio_fragment.content
+        )
+        assert_in('<div class="user-inputs-and-validation">', studio_fragment.content)
+        assert_in('<div class="xblock-inputs editor_content_wrapper">', studio_fragment.content)
+        assert_in('<div class="xblock-actions">', studio_fragment.content)
+
+    def test_calendar_document_submit(self):  # pylint: disable=no-self-use
+        """ Test studio submission of GoogleCalendarBlock """
+        block = TestGoogleCalendarBlock.make_calendar_block()
+
+        body = json.dumps({
+            'display_name': "Google Calendar",
+            'calendar_id': "google1234",
+            'default_view': 1
+        })
+        res = block.handle('studio_submit', make_request(body))
+        # pylint: disable=no-value-for-parameter
+        assert_equals(json.loads(res.body), {'result': 'success'})
+
+        assert_equals(block.display_name, "Google Calendar")
+        assert_equals(block.calendar_id, "google1234")
+        assert_equals(block.default_view, 1)
+
+        body = json.dumps('')
+        res = block.handle('studio_submit', make_request(body))
+        # pylint: disable=no-value-for-parameter
+        assert_equals(json.loads(res.body), {'result': 'error'})
+
+    def test_calendar_publish_event(self):  # pylint: disable=no-self-use
+        """ Test event publishing in GoogleCalendarBlock"""
+        block = TestGoogleCalendarBlock.make_calendar_block()
+
+        body = json.dumps({
+            'url': (
+                'https://www.google.com/calendar/embed?mode=Month&src=edx.org_lom804qe3ttspplj1bgeu1l3ak'
+                '@group.calendar.google.com&showCalendars=0'
+            ),
+            'displayed_in': 'iframe',
+            'event_type': 'edx.googlecomponent.calendar.displayed'
+        })
+        res = block.handle('publish_event', make_request(body))
+        # pylint: disable=no-value-for-parameter
+        assert_equals(json.loads(res.body), {'result': 'success'})
+
+        body = json.dumps({
+            'url': (
+                'https://www.google.com/calendar/embed?mode=Month&src=edx.org_lom804qe3ttspplj1bgeu1l3ak'
+                '@group.calendar.google.com&showCalendars=0'
+            ),
+            'displayed_in': 'iframe',
+        })
+        res = block.handle('publish_event', make_request(body))
+
+        assert_equals(json.loads(res.body), {'result': 'error', 'message': 'Missing event_type in JSON data'})
diff --git a/google_drive/tests/unit/test_docs.py b/google_drive/tests/unit/test_docs.py
index 483e824..9cce78a 100644
--- a/google_drive/tests/unit/test_docs.py
+++ b/google_drive/tests/unit/test_docs.py
@@ -1,165 +1,150 @@
+""" Unit tests for google document components """
 import json
-
-from webob import Request
+import unittest
 from mock import Mock
 
+from nose.tools import assert_equals, assert_in
 from workbench.runtime import WorkbenchRuntime
 from xblock.runtime import KvsFieldData, DictKeyValueStore
 
-from google_drive import GoogleDocumentBlock, GoogleCalendarBlock
-
-from nose.tools import (
-    assert_equals, assert_in
-)
-
-def make_request(body, method='POST'):
-    request = Request.blank('/')
-    request.method = 'POST'
-    request.body = body.encode('utf-8')
-    request.method = method
-    return request
-
-def make_document_block():
-    runtime = WorkbenchRuntime()
-    key_store = DictKeyValueStore()
-    db_model = KvsFieldData(key_store)
-    return GoogleDocumentBlock(runtime, db_model, Mock())
-
-def make_calendar_block():
-    runtime = WorkbenchRuntime()
-    key_store = DictKeyValueStore()
-    db_model = KvsFieldData(key_store)
-    return GoogleCalendarBlock(runtime, db_model, Mock())
-
-def test_document_templates_contents():
-    block = make_document_block()
-
-    student_fragment = block.render('student_view', Mock())
-    assert_in('<div class="google-docs-xblock-wrapper"', student_fragment.content)
-    assert_in('Google Document', student_fragment.content)
-    assert_in('https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsGAlanSo7r9z55ualwQlj-ofBQ/embed?start=true&loop=true&delayms=10000"\n    frameborder="0"\n    width="960"\n    height="569"\n    allowfullscreen="true"', student_fragment.content)
-
-    studio_fragment = block.render('studio_view', Mock())
-    assert_in('<div class="wrapper-comp-settings is-active editor-with-buttons google-edit-wrapper" id="settings-tab">', studio_fragment.content)
-    assert_in('<div class="user-inputs-and-validation">', studio_fragment.content)
-    assert_in('<div class="xblock-inputs editor_content_wrapper">', studio_fragment.content)
-    assert_in('<div class="xblock-actions">', studio_fragment.content)
-
-def test_calendar_templates_contents():
-    block = make_calendar_block()
-
-    student_fragment = block.render('student_view', Mock())
-    assert_in('<div class="google-calendar-xblock-wrapper">', student_fragment.content)
-    assert_in('https://www.google.com/calendar/embed?mode=Month&amp;src=edx.org_lom804qe3ttspplj1bgeu1l3ak@group.calendar.google.com&amp;showCalendars=0', student_fragment.content)
-    assert_in('Google Calendar', student_fragment.content)
-
-    studio_fragment = block.render('studio_view', Mock())
-    assert_in('<div class="wrapper-comp-settings is-active editor-with-buttons google-edit-wrapper" id="settings-tab">', studio_fragment.content)
-    assert_in('<div class="user-inputs-and-validation">', studio_fragment.content)
-    assert_in('<div class="xblock-inputs editor_content_wrapper">', studio_fragment.content)
-    assert_in('<div class="xblock-actions">', studio_fragment.content)
-
-def test_studio_document_submit():
-    block = make_document_block()
-
-    body = json.dumps({
-        'display_name': "Google Document",
-        'embed_code': "<iframe>",
-        'alt_text': "This is alt text",
-    })
-    res = block.handle('studio_submit', make_request(body))
-
-    assert_equals(json.loads(res.body), {'result': 'success'})
-
-    assert_equals(block.display_name, "Google Document")
-    assert_equals(block.embed_code, "<iframe>")
-    assert_equals(block.alt_text, "This is alt text")
-
-def test_calendar_document_submit():
-    block = make_calendar_block()
-
-    body = json.dumps({
-        'display_name': "Google Calendar",
-        'calendar_id': "google1234",
-        'default_view': 1
-    })
-    res = block.handle('studio_submit', make_request(body))
-
-    assert_equals(json.loads(res.body), {'result': 'success'})
-
-    assert_equals(block.display_name, "Google Calendar")
-    assert_equals(block.calendar_id, "google1234")
-    assert_equals(block.default_view, 1)
-
-def test_check_document_url():
-    block = make_document_block()
-
-    data = json.dumps({
-        'url': "https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsGAlanSo7r9z55ualwQlj-ofBQ/embed?start=true&loop=true&delayms=10000"
-    })
-    res = block.handle('check_url', make_request(data))
-
-    assert_equals(json.loads(res.body), {'status_code': 200})
-
-    data = json.dumps({
-        'url': 'undefined'
-    })
-    res = block.handle('check_url', make_request(data))
-
-    assert_equals(json.loads(res.body), {'status_code': 400})
-
-    data = json.dumps({
-        'url': "https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsdsadfGAlanSo7r9z55ualwQlj-ofBQ/embed?start=true&loop=true&delayms=10000"
-    })
-    res = block.handle('check_url', make_request(data))
-
-    assert_equals(json.loads(res.body), {'status_code': 404})
-
-def test_document_publish_event():
-    block = make_document_block()
-
-    body = json.dumps({
-        'url': 'https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsdsadfGAlanSo7r9z55ualwQlj-ofBQ/embed?start=true&loop=true&delayms=10000',
-        'displayed_in': 'iframe',
-        'event_type': 'edx.googlecomponent.document.displayed',
-    })
-    res = block.handle('publish_event', make_request(body))
-
-    assert_equals(json.loads(res.body), {'result': 'success'})
-
-    body = json.dumps({
-        'url': 'https://docs.google.com/drawings/d/1LHGzCTLRb--CDvFFjoYp62TiIN5KgsE7QOy9Sift_eg/pub?w=882&amp;h=657',
-        'displayed_in': 'img',
-        'event_type': 'edx.googlecomponent.document.displayed',
-    })
-    res = block.handle('publish_event', make_request(body))
-
-    assert_equals(json.loads(res.body), {'result': 'success'})
-
-    body = json.dumps({
-        'url': 'https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsdsadfGAlanSo7r9z55ualwQlj-ofBQ/embed?start=true&loop=true&delayms=10000',
-        'displayed_in': 'iframe',
-    })
-    res = block.handle('publish_event', make_request(body))
-
-    assert_equals(json.loads(res.body), {'result': 'error', 'message': 'Missing event_type in JSON data'})
-
-def test_calendar_publish_event():
-    block = make_calendar_block()
-
-    body = json.dumps({
-        'url': 'https://www.google.com/calendar/embed?mode=Month&src=edx.org_lom804qe3ttspplj1bgeu1l3ak@group.calendar.google.com&showCalendars=0',
-        'displayed_in': 'iframe',
-        'event_type': 'edx.googlecomponent.calendar.displayed'
-    })
-    res = block.handle('publish_event', make_request(body))
-
-    assert_equals(json.loads(res.body), {'result': 'success'})
-
-    body = json.dumps({
-        'url': 'https://www.google.com/calendar/embed?mode=Month&src=edx.org_lom804qe3ttspplj1bgeu1l3ak@group.calendar.google.com&showCalendars=0',
-        'displayed_in': 'iframe',
-    })
-    res = block.handle('publish_event', make_request(body))
-
-    assert_equals(json.loads(res.body), {'result': 'error', 'message': 'Missing event_type in JSON data'})
+from google_drive import GoogleDocumentBlock
+from google_drive.tests.unit.test_utils import generate_scope_ids, make_request
+
+
+class TestGoogleDocumentBlock(unittest.TestCase):
+    """ Tests for GoogleDocumentBlock """
+
+    @classmethod
+    def make_document_block(cls):
+        """ helper to construct a GoogleDocumentBlock """
+        runtime = WorkbenchRuntime()
+        key_store = DictKeyValueStore()
+        db_model = KvsFieldData(key_store)
+        ids = generate_scope_ids(runtime, 'google_document')
+        return GoogleDocumentBlock(runtime, db_model, scope_ids=ids)
+
+    def test_document_template_content(self):  # pylint: disable=no-self-use
+        """ Test content of GoogleDocumentBlock's rendered views """
+        block = TestGoogleDocumentBlock.make_document_block()
+        block.usage_id = Mock()
+
+        student_fragment = block.render('student_view', Mock())
+        # pylint: disable=no-value-for-parameter
+        assert_in('<div class="google-docs-xblock-wrapper"', student_fragment.content)
+        assert_in('Google Document', student_fragment.content)
+        assert_in(
+            (
+                'https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsGAlanSo7r9z55ualwQlj-ofBQ'
+                '/embed?start=true&loop'
+                '=true&delayms=10000"\n    frameborder="0"\n    width="960"\n    height="569"\n    '
+                'allowfullscreen="true"'
+            ),
+            student_fragment.content
+        )
+
+        studio_fragment = block.render('studio_view', Mock())
+        assert_in(
+            (
+                '<div class="wrapper-comp-settings is-active editor-with-buttons google-edit-wrapper" '
+                'id="document-settings-tab">'
+            ),
+            studio_fragment.content
+        )
+        assert_in('<div class="user-inputs-and-validation">', studio_fragment.content)
+        assert_in('<div class="xblock-inputs editor_content_wrapper">', studio_fragment.content)
+        assert_in('<div class="xblock-actions">', studio_fragment.content)
+
+    def test_studio_document_submit(self):  # pylint: disable=no-self-use
+        """ Test studio submission of GoogleDocumentBlock """
+        block = TestGoogleDocumentBlock.make_document_block()
+
+        body = json.dumps({
+            'display_name': "Google Document",
+            'embed_code': "<iframe>",
+            'alt_text': "This is alt text",
+        })
+        res = block.handle('studio_submit', make_request(body))
+        # pylint: disable=no-value-for-parameter
+        assert_equals(json.loads(res.body), {'result': 'success'})
+
+        assert_equals(block.display_name, "Google Document")
+        assert_equals(block.embed_code, "<iframe>")
+        assert_equals(block.alt_text, "This is alt text")
+
+        body = json.dumps('')
+        res = block.handle('studio_submit', make_request(body))
+        assert_equals(json.loads(res.body), {'result': 'error'})
+
+    def test_check_document_url(self):  # pylint: disable=no-self-use
+        """ Test verification of the provided Google Document URL"""
+        block = TestGoogleDocumentBlock.make_document_block()
+
+        data = json.dumps({
+            'url': (
+                "https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsGAl"
+                "anSo7r9z55ualwQlj-ofBQ/embed?start=true&loop=true&delayms=10000"
+            )
+        })
+        res = block.handle('check_url', make_request(data))
+        # pylint: disable=no-value-for-parameter
+        assert_equals(json.loads(res.body), {'status_code': 200})
+
+        data = json.dumps({
+            'url': 'undefined'
+        })
+        res = block.handle('check_url', make_request(data))
+
+        assert_equals(json.loads(res.body), {'status_code': 400})
+
+        data = json.dumps({
+            'url': (
+                "https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsdsadfG"
+                "AlanSo7r9z55ualwQlj-ofBQ/embed?start=true&loop=true&delayms=10000"
+            )
+        })
+        res = block.handle('check_url', make_request(data))
+
+        assert_equals(json.loads(res.body), {'status_code': 404})
+
+        data = json.dumps({})
+        res = block.handle('check_url', make_request(data))
+
+        assert_equals(json.loads(res.body), {'status_code': 400})
+
+    def test_document_publish_event(self):  # pylint: disable=no-self-use
+        """ Test event publishing in GoogleDocumentBlock"""
+        block = TestGoogleDocumentBlock.make_document_block()
+
+        body = json.dumps({
+            'url': (
+                'https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsdsadfGAlanSo7r9z55ualwQlj-ofBQ/embed'
+                '?start=true&loop=true&delayms=10000'
+            ),
+            'displayed_in': 'iframe',
+            'event_type': 'edx.googlecomponent.document.displayed',
+        })
+        res = block.handle('publish_event', make_request(body))
+        # pylint: disable=no-value-for-parameter
+        assert_equals(json.loads(res.body), {'result': 'success'})
+
+        body = json.dumps({
+            'url': (
+                'https://docs.google.com/drawings/d/1LHGzCTLRb--CDvFFjoYp62TiIN5KgsE7QOy9Sift_eg/'
+                'pub?w=882&amp;h=657'),
+            'displayed_in': 'img',
+            'event_type': 'edx.googlecomponent.document.displayed',
+        })
+        res = block.handle('publish_event', make_request(body))
+
+        assert_equals(json.loads(res.body), {'result': 'success'})
+
+        body = json.dumps({
+            'url': (
+                'https://docs.google.com/presentation/d/1x2ZuzqHsMoh1epK8VsdsadfGAlanSo7r9z55ualwQlj-ofBQ/embed'
+                '?start=true&loop=true&delayms=10000'
+            ),
+            'displayed_in': 'iframe',
+        })
+        res = block.handle('publish_event', make_request(body))
+
+        assert_equals(json.loads(res.body), {'result': 'error', 'message': 'Missing event_type in JSON data'})
diff --git a/google_drive/tests/unit/test_utils.py b/google_drive/tests/unit/test_utils.py
new file mode 100644
index 0000000..ae4694d
--- /dev/null
+++ b/google_drive/tests/unit/test_utils.py
@@ -0,0 +1,20 @@
+""" Utility functions used within unit tests """
+from webob import Request
+
+from xblock.fields import ScopeIds
+
+
+def generate_scope_ids(runtime, block_type):
+    """ helper to generate scope IDs for an XBlock """
+    def_id = runtime.id_generator.create_definition(block_type)
+    usage_id = runtime.id_generator.create_usage(def_id)
+    return ScopeIds('user', block_type, def_id, usage_id)
+
+
+def make_request(body, method='POST'):
+    """ helper to make a request """
+    request = Request.blank('/')
+    request.method = 'POST'
+    request.body = body.encode('utf-8')
+    request.method = method
+    return request
diff --git a/google_drive/utils.py b/google_drive/utils.py
deleted file mode 100644
index 77955f5..0000000
--- a/google_drive/utils.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-
-# Imports ###########################################################
-
-import logging
-import pkg_resources
-
-from django.template import Context, Template
-
-from xblockutils.resources import ResourceLoader
-from xblockutils.publish_event import PublishEventMixin
-
-# Globals ###########################################################
-
-log = logging.getLogger(__name__)
-
-
-# Functions #########################################################
-
-loader = ResourceLoader(__name__)
-
-class AttrDict(dict):
-    def __init__(self, *args, **kwargs):
-        super(AttrDict, self).__init__(*args, **kwargs)
-        self.__dict__ = self
diff --git a/requirements.txt b/requirements.txt
index 9287d86..b78dffd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,18 @@
+# May need to do this on a Mac - CPATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/libxml2 CFLAGS=-Qunused-arguments CPPFLAGS=-Qunused-arguments pip install lxml
+ddt
+lxml
+mock
+selenium
+pep8
+pylint
+coverage==3.7
+coveralls
+django==1.4.18
+-e git+https://github.com/nosedjango/nosedjango.git@ed7d7f9aa969252ff799ec159f828eaa8c1cbc5a#egg=nosedjango-dev
+-e git+https://github.com/edx-solutions/xblock-utils.git#egg=xblock-utils
+# Normally we'd use no specific hash here, but master appears to have a defect, a proposed solution appears in the git hash below
+-e git+https://github.com/edx/xblock-sdk.git@c251b8924ef5bf89fb59a0a5df2723114cdf4154#egg=xblock-sdk
+-e git+https://github.com/edx/XBlock.git#egg=XBlock
+-e git+https://github.com/edx/bok-choy.git#egg=bok-choy
+-e git+https://github.com/pmitros/django-pyfs.git@d175715e0fe3367ec0f1ee429c242d603f6e8b10#egg=djpyfs
 -e .
--e git://github.com/nosedjango/nosedjango.git@ed7d7f9aa969252ff799ec159f828eaa8c1cbc5a#egg=nosedjango-dev
--e git://github.com/edx-solutions/xblock-utils.git#egg=xblock-utils
diff --git a/setup.py b/setup.py
index e5b1b60..ece6081 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,9 @@ def package_data(pkg, roots):
         'XBlock',
         'xblock-utils',
     ],
-    dependency_links = ['http://github.com/edx-solutions/xblock-utils/tarball/master#egg=xblock-utils'],
+    dependency_links=[
+        'http://github.com/edx-solutions/xblock-utils/tarball/master#egg=xblock-utils',
+    ],
     entry_points={
         'xblock.v1': [
             'google-document = google_drive:GoogleDocumentBlock',