diff --git a/cms/djangoapps/contentstore/features/problem-editor.feature b/cms/djangoapps/contentstore/features/problem-editor.feature
new file mode 100644
index 0000000000..6028fa4b02
--- /dev/null
+++ b/cms/djangoapps/contentstore/features/problem-editor.feature
@@ -0,0 +1,5 @@
+Feature: Problem Editor
+  As a course author, I want to be able to create problems.
+
+  Scenario: User can view metadata
+    Given I have created a Blank Common Problem
\ No newline at end of file
diff --git a/cms/djangoapps/contentstore/features/problem-editor.py b/cms/djangoapps/contentstore/features/problem-editor.py
new file mode 100644
index 0000000000..4dc86709ba
--- /dev/null
+++ b/cms/djangoapps/contentstore/features/problem-editor.py
@@ -0,0 +1,19 @@
+#pylint: disable=C0111
+#pylint: disable=W0621
+
+from lettuce import world, step
+from nose.tools import assert_true, assert_equal, assert_in
+from terrain.steps import reload_the_page
+from selenium.common.exceptions import StaleElementReferenceException
+import time
+
+
+############### ACTIONS ####################
+@step('I have created a Blank Common Problem$')
+def i_created_blank_common_problem(step):
+    step.given('I have opened a new course section in Studio')
+    step.given('I have added a new subsection')
+    step.given('I expand the first section')
+    world.css_click('a.new-unit-item')
+    time.sleep(float(2))
+#    world.css_click('a.problem')
diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py
index f4b867d3c6..0fe3d950cd 100644
--- a/cms/envs/acceptance.py
+++ b/cms/envs/acceptance.py
@@ -23,7 +23,7 @@ MODULESTORE_OPTIONS = {
 
 MODULESTORE = {
     'default': {
-        'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore',
+        'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore',
         'OPTIONS': MODULESTORE_OPTIONS
     },
     'direct': {
diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt
index d3f90d5abc..6b28d3edd9 100644
--- a/requirements/edx/github.txt
+++ b/requirements/edx/github.txt
@@ -8,5 +8,5 @@
 -e git://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk
 
 # Our libraries:
--e git+https://github.com/edx/XBlock.git@483e0cb1#egg=XBlock
+-e git+https://github.com/edx/XBlock.git@2144a25d#egg=XBlock
 -e git+https://github.com/edx/codejail.git@07494f1#egg=codejail