diff --git a/test_requirements.txt b/test_requirements.txt
index 3d516bbf..88ca2c7e 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -4,81 +4,82 @@
 #
 #    pip-compile --output-file=test_requirements.txt test_requirements.in
 #
--e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock
--e git+https://github.com/edx/django-pyfs.git@2.1#egg=django-pyfs==2.1
--e file:///home/josh/opencraft/devstack/src/problem-builder/xblock-sdk
--e git+https://github.com/edx/xblock-utils.git@v1.2.3#egg=xblock-utils
-appdirs==1.4.3
+-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock  # via -r xblock-sdk/requirements/test.txt
+-e git+https://github.com/edx/django-pyfs.git@2.1#egg=django-pyfs==2.1  # via -r test_requirements.in
+-e xblock-sdk             # via -r test_requirements.in
+-e git+https://github.com/edx/xblock-utils.git@v1.2.3#egg=xblock-utils  # via -r test_requirements.in
+appdirs==1.4.3            # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, fs, virtualenv
 astroid==2.3.3            # via pylint
-attrs==19.3.0
-binaryornot==0.4.4
-bok_choy==0.7.1
-boto3==1.12.8
-boto==2.39.0
-botocore==1.15.8
-certifi==2019.11.28
-chardet==3.0.4
-cookiecutter==0.9.0
-coverage==5.0.3
-ddt==1.2.2
-distlib==0.3.0
-django-nose==1.4.6
-django==2.2.10
-docutils==0.15.2
-filelock==3.0.12
-fs-s3fs==0.1.8
-fs==2.0.27
-idna==2.8
-importlib-metadata==1.5.0
-importlib-resources==1.0.2
+atomicwrites==1.3.0       # via -r xblock-sdk/requirements/test.txt, pytest
+attrs==19.3.0             # via -r xblock-sdk/requirements/test.txt, pytest
+binaryornot==0.4.4        # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, cookiecutter
+bok_choy==0.7.1           # via -r test_requirements.in, -r xblock-sdk/requirements/test.txt
+boto3==1.12.9             # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, fs-s3fs
+boto==2.39.0              # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt
+botocore==1.15.9          # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, boto3, s3transfer
+certifi==2019.11.28       # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, requests
+chardet==3.0.4            # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, binaryornot, requests
+cookiecutter==0.9.0       # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt
+coverage==5.0.3           # via -r xblock-sdk/requirements/test.txt, pytest-cov
+ddt==1.2.2                # via -r test_requirements.in, -r xblock-sdk/requirements/test.txt
+distlib==0.3.0            # via -r xblock-sdk/requirements/test.txt, virtualenv
+django-nose==1.4.6        # via -r test_requirements.in
+django==2.2.10            # via -r test_requirements.in, -r xblock-sdk/requirements/base.txt, django-pyfs, xblock-sdk
+docutils==0.15.2          # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, botocore
+filelock==3.0.12          # via -r xblock-sdk/requirements/test.txt, tox, virtualenv
+fs-s3fs==0.1.8            # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, django-pyfs
+fs==2.0.27                # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, django-pyfs, fs-s3fs, xblock
+idna==2.8                 # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, requests
+importlib-metadata==1.5.0  # via -r xblock-sdk/requirements/test.txt, pluggy, pytest, tox, virtualenv
+importlib-resources==1.0.2  # via -r xblock-sdk/requirements/test.txt, virtualenv
 isort==4.3.21             # via pylint
-jinja2==2.11.1
-jmespath==0.9.5
+jinja2==2.11.1            # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, cookiecutter
+jmespath==0.9.5           # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, boto3, botocore
 lazy-object-proxy==1.4.3  # via astroid
-lazy==1.1
-lxml==3.8.0
-mako==1.1.1
-markupsafe==1.1.1
+lazy==1.1                 # via -r test_requirements.in, -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, acid-xblock, bok-choy
+lxml==3.8.0               # via -r test_requirements.in, -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, xblock
+mako==1.1.1               # via -r xblock-sdk/requirements/test.txt, acid-xblock, xblock-utils
+markupsafe==1.1.1         # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, jinja2, mako, xblock
 mccabe==0.6.1             # via pylint
-mock==3.0.5
-more-itertools==8.2.0
-needle==0.5.0
-nose==1.3.7
-packaging==20.1
-pathlib2==2.3.5
-pillow==7.0.0
-pluggy==0.13.1
-py==1.8.1
-pycodestyle==2.5.0
-pylint==2.4.4
-pyparsing==2.4.6
-pypng==0.0.20
-pytest-cov==2.8.1
-pytest-django==3.8.0
-pytest-rerunfailures==8.0
-pytest==5.3.5
-python-dateutil==2.8.1
-pytz==2019.3
-pyyaml==5.3
-requests==2.22.0
-s3transfer==0.3.3
-selenium==3.4.1
-simplejson==3.17.0
-six==1.14.0
-sqlparse==0.3.0
-toml==0.10.0
-tox-battery==0.5.2
-tox==3.14.5
+mock==3.0.5               # via -r test_requirements.in, -r xblock-sdk/requirements/test.txt
+more-itertools==5.0.0     # via -r xblock-sdk/requirements/test.txt, pytest
+needle==0.5.0             # via -r xblock-sdk/requirements/test.txt, bok-choy
+nose==1.3.7               # via -r xblock-sdk/requirements/test.txt, django-nose, needle
+packaging==20.1           # via -r xblock-sdk/requirements/test.txt, pytest, tox
+pathlib2==2.3.5           # via -r xblock-sdk/requirements/test.txt, pytest
+pillow==6.2.2             # via -r xblock-sdk/requirements/test.txt, needle
+pluggy==0.13.1            # via -r xblock-sdk/requirements/test.txt, pytest, tox
+py==1.8.1                 # via -r xblock-sdk/requirements/test.txt, pytest, tox
+pycodestyle==2.5.0        # via -r test_requirements.in
+pylint==2.4.4             # via -r test_requirements.in
+pyparsing==2.4.6          # via -r xblock-sdk/requirements/test.txt, packaging
+pypng==0.0.20             # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt
+pytest-cov==2.8.1         # via -r xblock-sdk/requirements/test.txt
+pytest-django==3.8.0      # via -r xblock-sdk/requirements/test.txt
+pytest-rerunfailures==8.0  # via -r xblock-sdk/requirements/test.txt
+pytest==4.6.9             # via -r test_requirements.in, -r xblock-sdk/requirements/test.txt, pytest-cov, pytest-django, pytest-rerunfailures
+python-dateutil==2.8.1    # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, botocore, xblock
+pytz==2019.3              # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, django, fs, xblock
+pyyaml==5.3               # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, cookiecutter, xblock
+requests==2.22.0          # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt
+s3transfer==0.3.3         # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, boto3
+selenium==3.4.1           # via -r test_requirements.in, -r xblock-sdk/requirements/test.txt, bok-choy, needle
+simplejson==3.17.0        # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, xblock-utils
+six==1.14.0               # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, astroid, bok-choy, django-pyfs, fs, fs-s3fs, mock, more-itertools, packaging, pathlib2, pytest, python-dateutil, tox, virtualenv, xblock
+sqlparse==0.3.0           # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, django
+toml==0.10.0              # via -r xblock-sdk/requirements/test.txt, tox
+tox-battery==0.5.2        # via -r xblock-sdk/requirements/test.txt
+tox==3.14.5               # via -r xblock-sdk/requirements/test.txt, tox-battery
 typed-ast==1.4.1          # via astroid
-typing==3.7.4.1
-urllib3==1.25.8
-virtualenv==20.0.7
-wcwidth==0.1.8
-web-fragments==0.3.1
-webob==1.8.6
+typing==3.7.4.1           # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, fs
+urllib3==1.25.8           # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, botocore, requests
+virtualenv==20.0.7        # via -r xblock-sdk/requirements/test.txt, tox
+wcwidth==0.1.8            # via -r xblock-sdk/requirements/test.txt, pytest
+web-fragments==0.3.1      # via -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, xblock
+webob==1.8.6              # via -r test_requirements.in, -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, xblock
 wrapt==1.11.2             # via astroid
-xblock==1.2.9
-zipp==1.2.0
+xblock==1.2.9             # via -r test_requirements.in, -r xblock-sdk/requirements/base.txt, -r xblock-sdk/requirements/test.txt, acid-xblock, xblock-utils
+zipp==1.2.0               # via -r xblock-sdk/requirements/test.txt, importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/xblock-sdk b/xblock-sdk
index 74bf5d60..e3d8f2a5 160000
--- a/xblock-sdk
+++ b/xblock-sdk
@@ -1 +1 @@
-Subproject commit 74bf5d6010b37e591a687e1e227263d689412279
+Subproject commit e3d8f2a505660bc5c3710c955576a5fefdcc4eaf