Repository: Consensys/diligence-fuzzing (language: python)

Issue:
Remove all mythx mentions



Discussion / hints:

Fix patch:
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 88f1772..b85f580 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-* MythX CLI version:
+* Fuzzing CLI version:
 * Python version:
 * Operating System:
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 18b927d..96321c2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,4 +1,4 @@
-name: MythX CLI
+name: Fuzzing CLI
 
 on: [push, pull_request]
 
diff --git a/.gitignore b/.gitignore
index 0e49119..2d2cc31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,5 +103,5 @@ ENV/
 .idea/
 .vscode/
 
-.mythx.yml
+.fuzz.yml
 .DS_Store
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 59e5240..42376e5 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -11,4 +11,4 @@ Development Lead
 Contributors
 ------------
 
-None yet. Why not be the first?
+* Nuradil Alymkulov <nurchik17@gmail.com>
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index ff42448..f55b4ec 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -15,7 +15,7 @@ Types of Contributions
 Report Bugs
 ~~~~~~~~~~~
 
-Report bugs at https://github.com/dmuhs/mythx-cli/issues.
+Report bugs at https://github.com/ConsenSys/diligence-fuzzing/issues.
 
 If you are reporting a bug, please include:
 
@@ -38,14 +38,14 @@ and "help wanted" is open to whoever wants to implement it.
 Write Documentation
 ~~~~~~~~~~~~~~~~~~~
 
-MythX CLI could always use more documentation, whether as part of the
-official MythX CLI docs, in docstrings, or even on the web in blog posts,
+Fuzzing CLI could always use more documentation, whether as part of the
+official Fuzzing CLI docs, in docstrings, or even on the web in blog posts,
 articles, and such.
 
 Submit Feedback
 ~~~~~~~~~~~~~~~
 
-The best way to send feedback is to file an issue at https://github.com/dmuhs/mythx-cli/issues.
+The best way to send feedback is to file an issue at https://github.com/ConsenSys/diligence-fuzzing/issues.
 
 If you are proposing a feature:
 
@@ -57,17 +57,17 @@ If you are proposing a feature:
 Get Started!
 ------------
 
-Ready to contribute? Here's how to set up `mythx-cli` for local development.
+Ready to contribute? Here's how to set up `diligence-fuzzing` for local development.
 
-1. Fork the `mythx-cli` repo on GitHub.
+1. Fork the `diligence-fuzzing` repo on GitHub.
 2. Clone your fork locally::
 
-    $ git clone git@github.com:your_name_here/mythx-cli.git
+    $ git clone git@github.com:your_name_here/diligence-fuzzing.git
 
 3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::
 
-    $ mkvirtualenv mythx-cli
-    $ cd mythx-cli/
+    $ mkvirtualenv fuzzing-cli
+    $ cd fuzzing-cli/
     $ python setup.py develop
 
 4. Create a branch for local development::
@@ -79,7 +79,7 @@ Ready to contribute? Here's how to set up `mythx-cli` for local development.
 5. When you're done making changes, check that your changes pass flake8 and the
    tests, including testing other Python versions with tox::
 
-    $ flake8 mythx_cli tests
+    $ flake8 fuzzing_cli tests
     $ python setup.py test or py.test
     $ tox
 
@@ -103,7 +103,7 @@ Before you submit a pull request, check that it meets these guidelines:
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
 3. The pull request should work for Python 3.6, 3.7, the 3.8-dev branch, and for PyPy.
-   Check https://travis-ci.org/dmuhs/mythx-cli/pull_requests and make sure that the
+   Check https://github.com/ConsenSys/diligence-fuzzing/actions and make sure that the
    tests pass for all supported Python versions.
 
 Tips
diff --git a/HISTORY.rst b/HISTORY.rst
index a820872..7c086fd 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,355 +3,18 @@ History
 =======
 
 
-0.6.22 (2020-10-05)
--------------------
-
-- Catch AttributeError on fauly Truffle artifact schema
-
-- Update :code:`pytest` to 6.1.1
-- Update :code:`isort` to 5.5.4
-
-
-0.6.21 (2020-09-18)
--------------------
-
-- Fix bug in render command analysis list pagination query
-
-- Update :code:`isort` to 5.5.2
-- Update :code:`pytest` to 6.0.2
-- Update :code`coverage` to 5.3
-
-
-0.6.20 (2020-09-05)
--------------------
-
-- Add table sort key parameter
-- Fix bug where payloads were unnecessarily duplicated before filtering
-- Improve custom rendering documentation
-- Improve HTML/MD default template styles
-- Refactor and speed up template rendering routines
-- Add file-indexed formatting/rendering data structures
-- Add Scribble middleware to support Solidity and Truffle
-- Add Scribble JSON support for Solidity jobs
-- Refactor Solidity payload job
-- Add truffle payload context generation
-- Remove deprecated Sonarqube formatter
-
-- Update :code:`py-solc-x` to 1.0.0
-- Update :code:`pytest` to 6.0.1
-- Update :code:`pytest-cov` to 2.10.1
-- Update :code:`coveralls` to 2.1.2
-- Update :code:`coverage` to 5.2.1
-- Update :code:`sphinx` to 3.2.1
-- Update :code:`isort` to 5.5.1
-- Update :code:`tox` to 3.20.0
-- Update :code:`watchdog` to 0.10.3
-- Update :code:`twine` to 3.2.0
-
-
-
-0.6.19 (2020-06-23)
--------------------
-
-- Add :code:`--stdout` flag to override YAML-defined :code:`output`
-
-
-0.6.18 (2020-06-16)
--------------------
-
-- Update :code:`pythx` to 1.6.1 to fix validation errors
-
-
-0.6.17 (2020-06-16)
--------------------
-
-- Add experimental Scribble integration for property validation
-- Remove bytecode payload option due to lack of usage
-- Require users to explicitly consent to analysis submission
-- Add feature that allows users to force a certain analysis scenario
-- Clean up code into payload-related job objects
-- Fix issue where pypy7.1.1-beta0 doesn't support PathLike in os.chdir
-- Slim down Solidity file walking logic
-- Refresh payload documentation
-- Refactor payload-related tests
-- Update :code:`py-solc-x` to 0.9.0
-- Update :code:`sphinx` to 3.1.1
-- Update :code:`pytest-cov` to 2.10.0
-- Update :code:`tox` to 3.15.2
-
-
-0.6.16 (2020-05-15)
--------------------
-
-- Whitelist OSX solc installations in :code:`py-solc-x`
-- Update :code:`bumpversion` to 0.6.0
-
-
-0.6.15 (2020-05-12)
--------------------
-
-- Fix bug where payload path prefix trimming was incorrect
-- Generate source list from Truffle artifact files
-- Improve Solidity file walk performance
-- Refactor payloads submodule
-- Update :code:`tox` to 3.15.0
-- Update :code:`pytest` to 5.4.2
-- Update :code:`py-solc-x` to 0.8.2
-
-
-0.6.14 (2020-04-30)
--------------------
-
-- Fix bug where location offsets were incorrectly displayed in reports
-- Fix bug where whitespace was incorrectly rendered in HTML reports
-- Clean up HTML report layout template code
-- Update :code:`click` to 7.1.2
-
-
-0.6.13 (2020-04-27)
--------------------
-
-- Add property verification flag docs
-- Add property checking flag to analyze command
-- Update :code:`sphinx` to 3.0.3
-
-
-0.6.12 (2020-04-20)
--------------------
-
-- Fix bug where new line characters were incorrectly sent on Windows OS
-- Fix bug where group creation from config was not triggered
-- Update :code:`sphinx` to 3.0.2
-- Update :code:`coverage` to 5.1
-- Update :code:`Jinja` to 2.11.2
-
-
-0.6.11 (2020-04-08)
--------------------
-
-- Use solc JSON stdin for compilation
-- Update :code:`sphinx` to 3.0.0
-- Update :code:`coveralls` to 2.0.0
-
-
-0.6.10 (2020-04-03)
--------------------
-
-- Add :code:`--api/--self` version command switch
-- Add explicit yaml config override feature
-- Documentation updates
-- Update :code:`tox` to 3.14.6
-- Update :code:`py-solc-x` to 0.8.1
-
-
-0.6.9 (2020-03-24)
-------------------
-
-Fix issue where request source list was malformed
-
-
-0.6.8 (2020-03-23)
-------------------
-
-- Add support for :code:`.mythx.yml` config files
-- Allow pwd definitions in solc import remappings
-- Fix bug in Solidity file walking routine
-- Add additional tox checks for documentation and formatting
-
-
-0.6.7 (2020-03-19)
-------------------
-
-Fix issue where render templates were not correctly added to manifest.
-
-
-0.6.6 (2020-03-19)
-------------------
-
-- Refactor commands into dedicated packages
-- Fix bug where click commands were not picked up by autodoc
-- Fix bug where :code:`render` command log cluttered report stdout
-- Add support for upper case targets in :code:`render` command
-- Add more verbose debug logging across package
-
-
-0.6.5 (2020-03-17)
-------------------
-
-- Add optional contract name specification for Solidity files
-- Revise usage and advanced usage docs for solc compilation
-- Add :code:`--remap-import` parameter for solc import remappings
-- Update :code:`coverage` to 5.0.4
-
-
-0.6.4 (2020-03-15)
-------------------
-
-- Add :code:`--include` flag to :code:`analyze` subcommand
-- Fix minor bug in package description content type definition
-- Update :code:`tox` to 3.14.5
-- Update :code:`sphinx` to 2.4.4
-- Update :code:`py-solc-x` to 0.8.0
-- Update :code:`click` to 7.1.1
-- Update :code:`pytest` 5.4.1
-
-
-0.6.3 (2020-02-15)
-------------------
-
-- Update :code:`sphinx` to 2.4.1
-- Improved Usage Guide documentation
-- Added more verbose descriptions in Advanced Usage guide
-- Add improved Python docstrings, enforce formatting
-- Add more precise type hints across the code base
-- Fix bug where Solidity payloads were truncated
-- Add :code:`mythx render --markdown` parameter for md reports
-- Add :code:`rglob` blacklist to exclude :code:`node_modules` during .sol directory walks
-
-
-0.6.2 (2020-02-08)
-------------------
-
-- Update :code:`pytest` to 5.3.5
-- Add :code:`mythx render` subcommand for HTML report rendering
-- Various HTML template improvements
-- Add :code:`Jinja2` and :code:`htmlmin` dependencies
-- Add documentation for custom template creation
-- Add filtering of Solidity payloads without compiled code (e.g. interfaces)
-
-
-0.6.0 & 0.6.1 (2020-01-29)
---------------------------
-
-- Add unified reports (e.g. :code:`json` output of multiple reports in a single JSON object)
-- Add SWC ID whitelist parameter to report filter
-- Integrate report filters with :code:`--ci` flag
-- Add advanced usage guide to documentation
-- Improved messaging across CLI
-- Update :code:`pytest` to 5.3.4
-- Improve test suite assertion diff display
-
-
-0.5.3 (2020-01-16)
-------------------
-
-- Bump :code:`py-solc-x` to 0.7.0
-
-
-0.5.2 (2020-01-16)
-------------------
-
-- Fix merge release mistake (yeah, sorry.)
-
-
-0.5.1 (2020-01-16)
-------------------
-
-- Add support for new modes (quick, standard, deep)
-- Fix issue where Truffle address placeholders resulted in invalid bytecode
-
-
-0.5.0 (2020-01-14)
-------------------
-
-- Add :code:`--create-group` flag to analyze subcommand
-- Add privacy feature to truncate paths in submission
-- Support Truffle projects as target directories
-- Add SonarQube output format option
-- Revamp usage documentation
-- Update coverage to 5.0.3
-- Update package details
-
-
-0.4.1 (2020-01-03)
-------------------
-
-- Add batch directory submission feature
-- Add a :code:`--yes` flag to skip confirmation messages
-
-0.4.0 (2020-01-02)
-------------------
-
-- Add :code:`--output` flag to print to file
-- Refactor test suite
-- Update coverage to 5.0.1
-- Update Sphinx to 2.3.1
-- Update tox to 3.14.3
-
-0.3.0 (2019-12-16)
-------------------
-
-- Add links to MythX dashboard in formatters
-- Add support for analysis groups
-- Split up logic in subcommands (analysis and group)
-- Add CI flag to return 1 on high-severity issues
-- Add parameter to blacklist SWC IDs
-- Fix bug where :code:`--solc-version` parameter did not work
-- Refactor test suite
-- Update pytest to 5.3.1
-- Update Sphinx to 2.3.0
-
-0.2.1 (2019-10-04)
-------------------
-
-- Update PythX to 1.3.2
-
-0.2.0 (2019-10-04)
-------------------
-
-- Update PythX to 1.3.1
-- Add tabular format option as new pretty default
-- Update pytest to 5.2.0
-- Various bugfixes
-
-0.1.8 (2019-09-16)
-------------------
-
-- Update dependencies to account for new submodules
-
-0.1.7 (2019-09-16)
-------------------
-
-- Update pythx from 1.2.4 to 1.2.5
-- Clean stale imports, fix formatting issues
-
-0.1.6 (2019-09-15)
-------------------
-
-- Improve CLI docstrings
-- Add more formatter-related documentation
-
-0.1.5 (2019-09-15)
-------------------
-
-- Add autodoc to Sphinx setup
-- Add middleware for tool name field
-- Enable pypy3 support
-- Add more verbose documentation
-- Allow username/password login
-
-0.1.4 (2019-09-13)
-------------------
-
-- Fix Atom's automatic Python import sorting (broke docs)
-
-0.1.3 (2019-09-13)
-------------------
-
-- Fix faulty version generated by bumpversion
-
-0.1.2 (2019-09-13)
+0.7.2 (2019-09-13)
 ------------------
 
-- Fix bumpversion regex issue
+- Add new format API Key support
+- Add :code:`project_name` config parameter
 
-0.1.1 (2019-09-13)
+0.7.1 (2019-09-13)
 ------------------
 
-- Initial implementation
-- Integrated Travis, PyUp, PyPI upload
+- Update Readme
 
-0.1.0 (2019-08-31)
+0.6.22 (2021-08-20)
 ------------------
 
 - First release on PyPI.
diff --git a/MANIFEST.in b/MANIFEST.in
index 7b6bc8b..9e2f41f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,7 +5,6 @@ include LICENSE
 include README.rst
 include requirements.txt
 include requirements_dev.txt
-include mythx_cli/render/templates/*
 
 recursive-include tests *
 recursive-exclude * __pycache__
diff --git a/Makefile b/Makefile
index f0a524b..09b56c9 100644
--- a/Makefile
+++ b/Makefile
@@ -51,20 +51,20 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr .pytest_cache
 
 format:
-	isort mythx_cli tests
-	black -t py38 mythx_cli tests
+	isort fuzzing_cli tests
+	black -t py38 fuzzing_cli tests
 
 lint: ## check style with flake8
-	flake8 mythx_cli tests
+	flake8 fuzzing_cli tests
 
 test: ## run tests quickly with the default Python
-	pytest --cov-report html --cov-report term --cov mythx_cli tests/
+	pytest --cov-report html --cov-report term --cov fuzzing_cli tests/
 
 test-all: ## run tests on every Python version with tox
 	tox
 
 coverage: ## check code coverage quickly with the default Python
-	coverage run --source mythx_cli -m pytest
+	coverage run --source fuzzing_cli -m pytest
 	coverage report -m
 	coverage html
 	$(BROWSER) htmlcov/index.html
diff --git a/mythx_cli/__init__.py b/fuzzing_cli/__init__.py
similarity index 74%
rename from mythx_cli/__init__.py
rename to fuzzing_cli/__init__.py
index d66e772..52c37ef 100644
--- a/mythx_cli/__init__.py
+++ b/fuzzing_cli/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-"""Top-level package for MythX CLI."""
+"""Top-level package for Fuzzing CLI."""
 
 __author__ = """Dominik Muhs"""
 __email__ = "dominik.muhs@consensys.net"
diff --git a/mythx_cli/cli.py b/fuzzing_cli/cli.py
similarity index 59%
rename from mythx_cli/cli.py
rename to fuzzing_cli/cli.py
index 88a95b6..0ed0c66 100644
--- a/mythx_cli/cli.py
+++ b/fuzzing_cli/cli.py
@@ -1,52 +1,28 @@
-"""The main runtime of the MythX CLI."""
+"""The main runtime of the Fuzzing CLI."""
 import logging
 import sys
 from pathlib import Path
 
 import click
 import yaml
-from pythx import MythXAPIError
 
-from mythx_cli import __version__
+from fuzzing_cli import __version__
 
-# DO NOT EDIT!! Breaks the app
-from mythx_cli.formatter import FORMAT_RESOLVER
-from mythx_cli.fuzz.arm import fuzz_arm
-from mythx_cli.fuzz.disarm import fuzz_disarm
-from mythx_cli.fuzz.run import fuzz_run
+from fuzzing_cli.fuzz.arm import fuzz_arm
+from fuzzing_cli.fuzz.disarm import fuzz_disarm
+from fuzzing_cli.fuzz.run import fuzz_run
 
-LOGGER = logging.getLogger("mythx-cli")
+LOGGER = logging.getLogger("fuzzing-cli")
 logging.basicConfig(level=logging.WARNING)
 
 
-class APIErrorCatcherGroup(click.Group):
-    """A custom click group to catch API-related errors.
-
-    This custom Group implementation catches :code:`MythXAPIError`
-    exceptions, which get raised when the API returns a non-200
-    status code. It is used to notify the user about the error that
-    happened instead of triggering an uncaught exception traceback.
-
-    It is given to the main CLI entrypoint and propagated to all
-    subcommands.
-    """
-
-    def __call__(self, *args, **kwargs):
-        try:
-            return self.main(*args, **kwargs)
-        except MythXAPIError as exc:
-            LOGGER.debug("Caught API error")
-            click.echo("The API returned an error:\n{}".format(exc))
-            sys.exit(1)
-
-
 # noinspection PyIncorrectDocstring
-@click.group(cls=APIErrorCatcherGroup)
+@click.group()
 @click.option(
     "--debug",
     is_flag=True,
     default=False,
-    envvar="MYTHX_DEBUG",
+    envvar="FUZZING_DEBUG",
     help="Provide additional debug output",
 )
 @click.option(
@@ -64,15 +40,8 @@ def cli(ctx, debug: bool, config: str, stdout: bool) -> None:
 
     :param ctx: Click context holding group-level parameters
     :param debug: Boolean to enable the `logging` debug mode
-    :param api_key: User JWT api token from the MythX dashboard
-    :param username: The MythX account ETH address/username
-    :param password: The account password from the MythX dashboard
-    :param fmt: The formatter to use for the subcommand output
-    :param ci: Boolean to return exit code 1 on medium/high-sev issues
-    :param output: Output file to write the results into
     :param config: YAML config file to read default parameters from
     :param stdout: Force printing to stdout and ignore output files
-    :param table_sort_key: The column to sort the default table output by
     """
 
     # set loggers to debug mode
@@ -83,13 +52,13 @@ def cli(ctx, debug: bool, config: str, stdout: bool) -> None:
     ctx.obj = {"debug": debug, "config": config}
 
     LOGGER.debug("Initializing configuration context")
-    config_file = config or ".mythx.yml"
+    config_file = config or ".fuzz.yml"
     if Path(config_file).is_file():
         LOGGER.debug(f"Parsing config at {config_file}")
         with open(config_file) as config_f:
             parsed_config = yaml.safe_load(config_f.read())
     else:
-        parsed_config = {"analyze": {}}
+        parsed_config = {"fuzz": {}, "analyze": {}}
 
     # The analyze/fuzz context is updated separately in the command
     # implementation
diff --git a/mythx_cli/fuzz/__init__.py b/fuzzing_cli/fuzz/__init__.py
similarity index 100%
rename from mythx_cli/fuzz/__init__.py
rename to fuzzing_cli/fuzz/__init__.py
diff --git a/mythx_cli/fuzz/arm.py b/fuzzing_cli/fuzz/arm.py
similarity index 95%
rename from mythx_cli/fuzz/arm.py
rename to fuzzing_cli/fuzz/arm.py
index e45ad8b..931099a 100644
--- a/mythx_cli/fuzz/arm.py
+++ b/fuzzing_cli/fuzz/arm.py
@@ -3,9 +3,9 @@
 
 import click
 
-from mythx_cli.fuzz.scribble import ScribbleMixin
+from fuzzing_cli.fuzz.scribble import ScribbleMixin
 
-LOGGER = logging.getLogger("mythx-cli")
+LOGGER = logging.getLogger("fuzzing-cli")
 
 
 @click.command("arm")
diff --git a/mythx_cli/fuzz/disarm.py b/fuzzing_cli/fuzz/disarm.py
similarity index 95%
rename from mythx_cli/fuzz/disarm.py
rename to fuzzing_cli/fuzz/disarm.py
index 6789db1..68e84bd 100644
--- a/mythx_cli/fuzz/disarm.py
+++ b/fuzzing_cli/fuzz/disarm.py
@@ -3,9 +3,9 @@
 
 import click
 
-from mythx_cli.fuzz.scribble import ScribbleMixin
+from fuzzing_cli.fuzz.scribble import ScribbleMixin
 
-LOGGER = logging.getLogger("mythx-cli")
+LOGGER = logging.getLogger("fuzzing-cli")
 
 
 @click.command("disarm")
diff --git a/mythx_cli/fuzz/exceptions.py b/fuzzing_cli/fuzz/exceptions.py
similarity index 86%
rename from mythx_cli/fuzz/exceptions.py
rename to fuzzing_cli/fuzz/exceptions.py
index 59e8cf7..a761c86 100644
--- a/mythx_cli/fuzz/exceptions.py
+++ b/fuzzing_cli/fuzz/exceptions.py
@@ -54,49 +54,35 @@ class CreateFaaSCampaignError(FaaSError):
 
 
 #
-# Brownie Job Errors
+# RPC client
 #
 
 
-class BrownieError(Exception):
-    """Base class for Brownie Job exceptions"""
-
-    def __init__(self, message):
-        self.message = message
-
-    pass
-
-
-class BuildArtifactsError(BrownieError):
-    """Exception raised for errors fetching the build artifacts"""
+class RPCCallError(FaaSError):
+    """Exception raised when there is an error calling the RPC endpoint"""
 
     pass
 
 
-class SourceError(BrownieError):
-    """Exception raised for errors the source and AST of a source file"""
+class SeedStateError(FaaSError):
+    """Exception raised when there is an error generating the seed state"""
 
     pass
 
 
-class PayloadError(BrownieError):
-    """Exception raised for errors assembling the FaaS payload"""
+class BrownieError(FaaSError):
+    """Base class for Brownie Job exceptions"""
 
     pass
 
 
-#
-# RPC client
-#
-
-
-class RPCCallError(FaaSError):
-    """Exception raised when there is an error calling the RPC endpoint"""
+class BuildArtifactsError(BrownieError):
+    """Exception raised for errors fetching the build artifacts"""
 
     pass
 
 
-class SeedStateError(FaaSError):
-    """Exception raised when there is an error generating the seed state"""
+class SourceError(BrownieError):
+    """Exception raised for errors the source and AST of a source file"""
 
     pass
diff --git a/mythx_cli/fuzz/faas.py b/fuzzing_cli/fuzz/faas.py
similarity index 56%
rename from mythx_cli/fuzz/faas.py
rename to fuzzing_cli/fuzz/faas.py
index a9710b9..b1050c0 100644
--- a/mythx_cli/fuzz/faas.py
+++ b/fuzzing_cli/fuzz/faas.py
@@ -6,18 +6,17 @@
 import requests
 from requests.structures import CaseInsensitiveDict
 
-from mythx_cli.fuzz.scribble import ScribbleMixin
+from fuzzing_cli.fuzz.scribble import ScribbleMixin
 
 from .exceptions import (
     AuthorizationError,
     BadStatusCode,
-    CreateFaaSCampaignError,
     PayloadError,
     RequestError,
     ScribbleMetaError,
 )
 
-LOGGER = logging.getLogger("mythx-cli")
+LOGGER = logging.getLogger("fuzzing-cli")
 
 
 class FaasClient:
@@ -36,26 +35,36 @@ def __init__(
         client_id,
         refresh_token,
         auth_endpoint,
-        project
+        project,
     ):
         self.faas_url = faas_url
         self.campaign_name_prefix = campaign_name_prefix
         self.project_type = project_type
         self.project = project
-        self.api_key = api_key or self.retrieve_api_key(
-            client_id, refresh_token, auth_endpoint
-        )
-        self.headers = CaseInsensitiveDict()
-        self.headers["Content-Type"] = "application/json"
-        self.headers["Authorization"] = "Bearer " + str(self.api_key)
 
-    def retrieve_api_key(self, client_id, refresh_token, auth_endpoint):
+        self._api_key = api_key
+        self._client_id = client_id
+        self._refresh_token = refresh_token
+        self._auth_endpoint = auth_endpoint
+
+    @property
+    def headers(self):
+        headers = CaseInsensitiveDict()
+        headers["Content-Type"] = "application/json"
+        headers["Authorization"] = "Bearer " + str(self.api_key)
+        return headers
+
+    @property
+    def api_key(self):
+        if self._api_key:
+            return self._api_key
+
         response = requests.post(
-            f"https://{auth_endpoint}/oauth/token",
+            f"https://{self._auth_endpoint}/oauth/token",
             data={
                 "grant_type": "refresh_token",
-                "client_id": client_id,
-                "refresh_token": refresh_token,
+                "client_id": self._client_id,
+                "refresh_token": self._refresh_token,
             },
         )
         body = response.json()
@@ -77,10 +86,10 @@ def start_faas_campaign(self, payload):
         """Make HTTP request to the faas"""
         try:
             req_url = f"{self.faas_url}/api/campaigns/?start_immediately=true"
-            response = requests.post(req_url, json=payload, headers=self.headers)
+            h = self.headers
+            response = requests.post(req_url, json=payload, headers=h)
             response_data = response.json()
             if response.status_code != requests.codes.ok:
-                print(response.text)
                 raise BadStatusCode(
                     f"Got http status code {response.status_code} for request {req_url}",
                     detail=response_data["detail"],
@@ -89,7 +98,7 @@ def start_faas_campaign(self, payload):
         except Exception as e:
             if isinstance(e, BadStatusCode):
                 raise e
-            raise RequestError(f"Error starting FaaS campaign.")
+            raise RequestError("Error starting FaaS campaign", detail=str(e))
 
     def create_faas_campaign(self, campaign_data, seed_state, dry_run=False):
         """Submit a campaign to the FaaS and start that campaign.
@@ -110,43 +119,42 @@ def create_faas_campaign(self, campaign_data, seed_state, dry_run=False):
         :return: Campaign ID
         """
         try:
-            try:
-                api_payload_params = {
-                    "discovery-probability-threshold": seed_state[
-                        "discovery-probability-threshold"
-                    ],
-                    "num-cores": seed_state["num-cores"],
-                    "assertion-checking-mode": seed_state["assertion-checking-mode"],
-                }
-
-                api_payload = {
-                    "parameters": api_payload_params,
-                    "name": self.generate_campaign_name(),
-                    "corpus": seed_state["analysis-setup"],
-                    "sources": campaign_data.payload["sources"],
-                    "contracts": campaign_data.payload["contracts"],
-                    "project": self.project,
-                }
-            except Exception:
-                raise PayloadError(f"Error extracting data from payload")
-
-            try:
-                instr_meta = ScribbleMixin.get_arming_instr_meta()
-
-                if instr_meta is not None:
-                    api_payload["instrumentationMetadata"] = instr_meta
-            except Exception as e:
-                raise ScribbleMetaError(
-                    f"Error getting Scribble arming metadata."
-                ) from e
-
-            if dry_run:
-                print("Printing output \n --------")
-                print(f"{json.dumps(api_payload)}")
-                print("End of output \n --------")
-                return "campaign not started due to --dry-run option"
-            campaign_id = self.start_faas_campaign(api_payload)
-
-            return campaign_id
-        except (PayloadError, ScribbleMetaError) as e:
-            raise CreateFaaSCampaignError(f"Error creating the FaaS campaign:")
+            api_payload_params = {
+                "discovery-probability-threshold": seed_state[
+                    "discovery-probability-threshold"
+                ],
+                "num-cores": seed_state["num-cores"],
+                "assertion-checking-mode": seed_state["assertion-checking-mode"],
+            }
+
+            api_payload = {
+                "parameters": api_payload_params,
+                "name": self.generate_campaign_name(),
+                "corpus": seed_state["analysis-setup"],
+                "sources": campaign_data.payload["sources"],
+                "contracts": campaign_data.payload["contracts"],
+                "project": self.project,
+            }
+        except KeyError as e:
+            raise PayloadError(
+                "Error extracting data from payload", detail=f"Key {str(e)} not found"
+            )
+
+        try:
+            instr_meta = ScribbleMixin.get_arming_instr_meta()
+            if instr_meta is not None:
+                api_payload["instrumentationMetadata"] = instr_meta
+        except Exception as e:
+            raise ScribbleMetaError(
+                "Error getting Scribble arming metadata.", detail=str(e)
+            )
+
+        if dry_run:
+            print("Printing output \n --------")
+            print(f"{json.dumps(api_payload)}")
+            print("End of output \n --------")
+            return "campaign not started due to --dry-run option"
+
+        campaign_id = self.start_faas_campaign(api_payload)
+
+        return campaign_id
diff --git a/fuzzing_cli/fuzz/ide/__init__.py b/fuzzing_cli/fuzz/ide/__init__.py
new file mode 100644
index 0000000..6e046ea
--- /dev/null
+++ b/fuzzing_cli/fuzz/ide/__init__.py
@@ -0,0 +1,3 @@
+from .brownie import BrownieJob
+from .hardhat import HardhatJob
+from .truffle import TruffleJob
diff --git a/mythx_cli/fuzz/ide/brownie.py b/fuzzing_cli/fuzz/ide/brownie.py
similarity index 96%
rename from mythx_cli/fuzz/ide/brownie.py
rename to fuzzing_cli/fuzz/ide/brownie.py
index a565d44..d7787b2 100644
--- a/mythx_cli/fuzz/ide/brownie.py
+++ b/fuzzing_cli/fuzz/ide/brownie.py
@@ -2,12 +2,12 @@
 from pathlib import Path
 from typing import List
 
-from mythx_cli.fuzz.exceptions import BuildArtifactsError
-from mythx_cli.fuzz.ide.generic import IDEArtifacts, JobBuilder
+from fuzzing_cli.fuzz.exceptions import BuildArtifactsError
+from fuzzing_cli.fuzz.ide.generic import IDEArtifacts, JobBuilder
 
 from ...util import get_content_from_file, sol_files_by_directory
 
-LOGGER = logging.getLogger("mythx-cli")
+LOGGER = logging.getLogger("fuzzing-cli")
 
 
 class BrownieArtifacts(IDEArtifacts):
diff --git a/mythx_cli/fuzz/ide/generic.py b/fuzzing_cli/fuzz/ide/generic.py
similarity index 96%
rename from mythx_cli/fuzz/ide/generic.py
rename to fuzzing_cli/fuzz/ide/generic.py
index 933da1b..86fafc6 100644
--- a/mythx_cli/fuzz/ide/generic.py
+++ b/fuzzing_cli/fuzz/ide/generic.py
@@ -3,7 +3,7 @@
 from pathlib import Path
 from typing import Dict
 
-from mythx_cli.fuzz.exceptions import BuildArtifactsError
+from fuzzing_cli.fuzz.exceptions import BuildArtifactsError
 
 
 class IDEArtifacts(ABC):
diff --git a/mythx_cli/fuzz/ide/hardhat.py b/fuzzing_cli/fuzz/ide/hardhat.py
similarity index 97%
rename from mythx_cli/fuzz/ide/hardhat.py
rename to fuzzing_cli/fuzz/ide/hardhat.py
index 24d8eb5..43338e5 100644
--- a/mythx_cli/fuzz/ide/hardhat.py
+++ b/fuzzing_cli/fuzz/ide/hardhat.py
@@ -3,8 +3,8 @@
 from pathlib import Path
 from typing import List
 
-from mythx_cli.fuzz.exceptions import BuildArtifactsError
-from mythx_cli.fuzz.ide.generic import IDEArtifacts, JobBuilder
+from fuzzing_cli.fuzz.exceptions import BuildArtifactsError
+from fuzzing_cli.fuzz.ide.generic import IDEArtifacts, JobBuilder
 
 from ...util import get_content_from_file, sol_files_by_directory
 
diff --git a/mythx_cli/fuzz/ide/truffle.py b/fuzzing_cli/fuzz/ide/truffle.py
similarity index 97%
rename from mythx_cli/fuzz/ide/truffle.py
rename to fuzzing_cli/fuzz/ide/truffle.py
index ffdc7b9..07e88a5 100644
--- a/mythx_cli/fuzz/ide/truffle.py
+++ b/fuzzing_cli/fuzz/ide/truffle.py
@@ -5,9 +5,9 @@
 from tempfile import TemporaryFile
 from typing import Any, Dict, List
 
-from mythx_cli.fuzz.exceptions import BuildArtifactsError
-from mythx_cli.fuzz.ide.generic import IDEArtifacts, JobBuilder
-from mythx_cli.util import LOGGER, sol_files_by_directory
+from fuzzing_cli.fuzz.exceptions import BuildArtifactsError
+from fuzzing_cli.fuzz.ide.generic import IDEArtifacts, JobBuilder
+from fuzzing_cli.util import LOGGER, sol_files_by_directory
 
 
 class TruffleArtifacts(IDEArtifacts):
diff --git a/mythx_cli/fuzz/options.py b/fuzzing_cli/fuzz/options.py
similarity index 93%
rename from mythx_cli/fuzz/options.py
rename to fuzzing_cli/fuzz/options.py
index 303f15d..7b9839b 100644
--- a/mythx_cli/fuzz/options.py
+++ b/fuzzing_cli/fuzz/options.py
@@ -12,7 +12,7 @@ def __init__(
         target: Optional[List[str]] = None,
         map_to_original_source: bool = False,
         rpc_url: str = "http://localhost:7545",
-        faas_url: str = "https://fuzzing-staging.diligence.tools",
+        faas_url: str = "https://fuzzing.diligence.tools",
         number_of_cores: int = 2,
         campaign_name_prefix: str = "untitled",
         corpus_target: Optional[str] = None,
@@ -74,22 +74,22 @@ def validate(self, refresh_token: str):
         if not self.build_directory:
             raise click.exceptions.UsageError(
                 "Build directory not provided. You need to set the `build_directory` "
-                "on the `fuzz` key of your .mythx.yml config file."
+                "on the `fuzz` key of your .fuzz.yml config file."
             )
         if not self.api_key and not refresh_token:
             raise click.exceptions.UsageError(
                 "API key or Refresh Token were not provided. You need to provide either an API key or a Refresh Token"
                 "as the `--api-key` or `--refresh-token` parameters respectively of the fuzz run command"
-                "or set `api_key` or `refresh_token` on the `fuzz` key of your .mythx.yml config file."
+                "or set `api_key` or `refresh_token` on the `fuzz` key of your .fuzz.yml config file."
             )
         if not self.deployed_contract_address:
             raise click.exceptions.UsageError(
                 "Deployed contract address not provided. You need to provide an address as the `--address` "
                 "parameter of the fuzz run command.\nYou can also set the `deployed_contract_address`"
-                "on the `fuzz` key of your .mythx.yml config file."
+                "on the `fuzz` key of your .fuzz.yml config file."
             )
         if not self.target:
             raise click.exceptions.UsageError(
                 "Target not provided. You need to provide a target as the last parameter of the fuzz run command."
-                "\nYou can also set the `targets` on the `fuzz` key of your .mythx.yml config file."
+                "\nYou can also set the `targets` on the `fuzz` key of your .fuzz.yml config file."
             )
diff --git a/mythx_cli/fuzz/rpc.py b/fuzzing_cli/fuzz/rpc.py
similarity index 99%
rename from mythx_cli/fuzz/rpc.py
rename to fuzzing_cli/fuzz/rpc.py
index ee76b5d..a0a027d 100644
--- a/mythx_cli/fuzz/rpc.py
+++ b/fuzzing_cli/fuzz/rpc.py
@@ -7,7 +7,7 @@
 
 from .exceptions import RPCCallError
 
-LOGGER = logging.getLogger("mythx-cli")
+LOGGER = logging.getLogger("fuzzing-cli")
 
 headers = {"Content-Type": "application/json"}
 time_limit_seconds = 3000
diff --git a/mythx_cli/fuzz/run.py b/fuzzing_cli/fuzz/run.py
similarity index 84%
rename from mythx_cli/fuzz/run.py
rename to fuzzing_cli/fuzz/run.py
index 5f213ce..baac474 100644
--- a/mythx_cli/fuzz/run.py
+++ b/fuzzing_cli/fuzz/run.py
@@ -5,17 +5,15 @@
 from pathlib import Path
 
 import click
+from click import ClickException, UsageError
 
-from mythx_cli.fuzz.ide.brownie import BrownieJob
-from mythx_cli.fuzz.ide.hardhat import HardhatJob
-
-from .exceptions import BadStatusCode, RPCCallError
+from .exceptions import FaaSError, RPCCallError
 from .faas import FaasClient
-from .ide.truffle import TruffleJob
+from .ide import BrownieJob, HardhatJob, TruffleJob
 from .options import FuzzingOptions
 from .rpc import RPCClient
 
-LOGGER = logging.getLogger("mythx-cli")
+LOGGER = logging.getLogger("fuzzing-cli")
 
 headers = {"Content-Type": "application/json"}
 
@@ -47,12 +45,11 @@ def check_contract(rpc_client: RPCClient, deployed_contract_address: str):
     try:
         contract_code_response = rpc_client.contract_exists(deployed_contract_address)
     except RPCCallError as e:
-        raise click.exceptions.UsageError(f"RPC endpoint." f"\n{e}")
+        raise UsageError(f"{e}")
 
     if not contract_code_response:
-        LOGGER.warning(f"Contract code not found")
-        raise click.exceptions.ClickException(
-            f"Unable to find a contract deployed at {deployed_contract_address}."
+        raise ClickException(
+            f"Unable to find a contract deployed at {deployed_contract_address}"
         )
 
 
@@ -108,7 +105,6 @@ def check_contract(rpc_client: RPCClient, deployed_contract_address: str):
     type=click.STRING,
     default=None,
     help="API key, can be created on the FaaS Dashboard. ",
-    hidden=True,
 )
 @click.option(
     "--refresh-token",
@@ -123,7 +119,7 @@ def check_contract(rpc_client: RPCClient, deployed_contract_address: str):
     type=click.STRING,
     default=None,
     help="The project name this campaign will be attached to. You can use the project name or the project id."
-    "Alternatively, you may also configure the 'project' field in the .mythx.yml configuration file."
+    "Alternatively, you may also configure the 'project' field in the .fuzz.yml configuration file."
     "If no project is configured the scan will be attached to the 'Default Project'.",
 )
 @click.pass_obj
@@ -138,19 +134,23 @@ def fuzz_run(
     key,
     refresh_token,
     map_to_original_source,
-    project
+    project,
 ):
     if not key and refresh_token:
         key = refresh_token
     analyze_config = ctx.get("fuzz")
 
     if analyze_config.get("api_key") or api_key:
-        LOGGER.warning("The --api-key parameter and 'api_key' configuration file option value have been"
-                       " deprecated. You should use the --key and 'key' options instead.")
+        LOGGER.warning(
+            "The --api-key parameter and 'api_key' configuration file option value have been"
+            " deprecated. You should use the --key and 'key' options instead."
+        )
 
     if analyze_config.get("refresh_token") or refresh_token:
-        LOGGER.warning("The --refresh-token parameter and 'refresh_token' configuration file option have been"
-                       " deprecated. You should use the --key and 'key' options instead.")
+        LOGGER.warning(
+            "The --refresh-token parameter and 'refresh_token' configuration file option have been"
+            " deprecated. You should use the --key and 'key' options instead."
+        )
 
     options = FuzzingOptions(
         **{
@@ -214,7 +214,7 @@ def fuzz_run(
         )
         artifacts.generate_payload()
     else:
-        raise click.exceptions.UsageError(
+        raise UsageError(
             f"Projects using plain solidity files is not supported right now"
         )
 
@@ -226,7 +226,7 @@ def fuzz_run(
         client_id=options.auth_client_id,
         refresh_token=options.refresh_token,
         auth_endpoint=options.auth_endpoint,
-        project=options.project
+        project=options.project,
     )
 
     try:
@@ -239,14 +239,13 @@ def fuzz_run(
             + "/campaigns/"
             + str(campaign_id)
         )
-    except BadStatusCode as e:
-        raise click.exceptions.UsageError(
-            f"Campaign submission error. Detail - {e.detail}"
-        )
     except Exception as e:
+        if isinstance(e, FaaSError):
+            raise ClickException(
+                message=f"{type(e).__name__}: {e.message}\nDetail: {e.detail}"
+            )
+
         LOGGER.warning(
             f"Could not submit campaign to the FaaS\n{traceback.format_exc()}"
         )
-        raise click.exceptions.UsageError(
-            f"Unable to submit the campaign to the faas. Are you sure the service is running on {options.faas_url} ?"
-        )
+        raise ClickException(message=f"Unhandled exception - {str(e)}")
diff --git a/mythx_cli/fuzz/scribble.py b/fuzzing_cli/fuzz/scribble.py
similarity index 99%
rename from mythx_cli/fuzz/scribble.py
rename to fuzzing_cli/fuzz/scribble.py
index 8b5cdb1..153ca24 100644
--- a/mythx_cli/fuzz/scribble.py
+++ b/fuzzing_cli/fuzz/scribble.py
@@ -7,7 +7,7 @@
 
 import click
 
-from mythx_cli.util import sol_files_by_directory
+from fuzzing_cli.util import sol_files_by_directory
 
 SCRIBBLE_ARMING_META_FILE = ".scribble-arming.meta.json"
 
diff --git a/mythx_cli/fuzz/util.py b/fuzzing_cli/fuzz/util.py
similarity index 97%
rename from mythx_cli/fuzz/util.py
rename to fuzzing_cli/fuzz/util.py
index 32f4dd4..8f22835 100644
--- a/mythx_cli/fuzz/util.py
+++ b/fuzzing_cli/fuzz/util.py
@@ -1,4 +1,4 @@
-"""This module contains helpers for generating MythX analysis payloads."""
+"""This module contains helpers for generating Fuzzing analysis payloads."""
 
 import logging
 from enum import Enum
@@ -9,7 +9,7 @@
 
 import click
 
-LOGGER = logging.getLogger("mythx-cli")
+LOGGER = logging.getLogger("fuzzing-cli")
 
 
 class ScenarioMode(Enum):
@@ -112,7 +112,7 @@ def sanitize_paths(job: Dict) -> Dict:
 
     This method takes a job payload, iterates through all paths, and
     removes all their common prefixes. This is an effort to only submit
-    information on a need-to-know basis to MythX. Unless it's to distinguish
+    information on a need-to-know basis to Fuzzing. Unless it's to distinguish
     between files, the API does not need to know the absolute path of a file.
     This may even leak user information and should be removed.
 
diff --git a/mythx_cli/util.py b/fuzzing_cli/util.py
similarity index 95%
rename from mythx_cli/util.py
rename to fuzzing_cli/util.py
index 7440b7c..19c6fe8 100644
--- a/mythx_cli/util.py
+++ b/fuzzing_cli/util.py
@@ -6,9 +6,19 @@
 import click
 from mythx_models.response import AnalysisInputResponse, DetectedIssuesResponse
 
-from mythx_cli.formatter.util import get_source_location_by_offset
+LOGGER = logging.getLogger("fuzzing-cli")
 
-LOGGER = logging.getLogger("mythx-cli")
+
+def get_source_location_by_offset(source: str, offset: int) -> int:
+    """Retrieve the Solidity source code location based on the source map
+    offset.
+
+    :param source: The Solidity source to analyze
+    :param offset: The source map's offset
+    :return: The offset's source line number equivalent
+    """
+
+    return source.encode("utf-8")[0:offset].count("\n".encode("utf-8")) + 1
 
 
 class SourceMapLocation:
@@ -143,7 +153,7 @@ def index_by_filename(
     """Index the given report/input responses by filename.
 
     This will return a simplified, unified representation of the report/input payloads
-    returned by the MythX API. It is a mapping from filename to an iterable of issue
+    returned by the Fuzzing API. It is a mapping from filename to an iterable of issue
     objects, which contain the report UUID, SWC ID, SWC title, short and long
     description, severity, as well as the issue's line location in the source code.
 
diff --git a/mythx_cli/.DS_Store b/mythx_cli/.DS_Store
deleted file mode 100644
index 9c53d6d..0000000
Binary files a/mythx_cli/.DS_Store and /dev/null differ
diff --git a/mythx_cli/formatter/.DS_Store b/mythx_cli/formatter/.DS_Store
deleted file mode 100644
index 9c6db64..0000000
Binary files a/mythx_cli/formatter/.DS_Store and /dev/null differ
diff --git a/mythx_cli/formatter/__init__.py b/mythx_cli/formatter/__init__.py
deleted file mode 100644
index 9cdcd3e..0000000
--- a/mythx_cli/formatter/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""This module contains various formatters for printing report data."""
-
-from .json import JSONFormatter, PrettyJSONFormatter
-from .simple_stdout import SimpleFormatter
-from .tabular import TabularFormatter
-
-FORMAT_RESOLVER = {
-    "simple": SimpleFormatter(),
-    "json": JSONFormatter(),
-    "json-pretty": PrettyJSONFormatter(),
-    "table": TabularFormatter(),
-}
-
-__all__ = [JSONFormatter, PrettyJSONFormatter, SimpleFormatter, TabularFormatter]
diff --git a/mythx_cli/formatter/base.py b/mythx_cli/formatter/base.py
deleted file mode 100644
index e653c14..0000000
--- a/mythx_cli/formatter/base.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""This module contains the base formatter interface."""
-
-import abc
-from typing import List, Optional, Tuple
-
-from mythx_models.response import (
-    AnalysisInputResponse,
-    AnalysisListResponse,
-    AnalysisStatusResponse,
-    DetectedIssuesResponse,
-    VersionResponse,
-)
-
-
-class BaseFormatter(abc.ABC):
-    """The base formatter interface for printing various response types."""
-
-    report_requires_input = False
-
-    @staticmethod
-    @abc.abstractmethod
-    def format_analysis_list(obj: AnalysisListResponse) -> str:
-        """Format an analysis list response."""
-
-        pass  # pragma: no cover
-
-    @staticmethod
-    def format_analysis_status(resp: AnalysisStatusResponse) -> str:
-        """Format an analysis status response."""
-
-        pass  # pragma: no cover
-
-    @staticmethod
-    @abc.abstractmethod
-    def format_detected_issues(
-        issues_list: List[
-            Tuple[str, DetectedIssuesResponse, Optional[AnalysisInputResponse]]
-        ],
-        **kwargs,
-    ) -> str:
-        """Format an issue report response."""
-
-        pass  # pragma: no cover
-
-    @staticmethod
-    @abc.abstractmethod
-    def format_version(obj: VersionResponse) -> str:
-        """Format a version response."""
-
-        pass  # pragma: no cover
diff --git a/mythx_cli/formatter/json.py b/mythx_cli/formatter/json.py
deleted file mode 100644
index 950497a..0000000
--- a/mythx_cli/formatter/json.py
+++ /dev/null
@@ -1,144 +0,0 @@
-"""This module contains the compressed and pretty-printing JSON formatters."""
-
-import json
-from typing import List, Optional, Tuple
-
-from mythx_models.response import (
-    AnalysisInputResponse,
-    AnalysisListResponse,
-    AnalysisStatusResponse,
-    DetectedIssuesResponse,
-    GroupListResponse,
-    GroupStatusResponse,
-    ProjectListResponse,
-    VersionResponse,
-)
-
-from mythx_cli.formatter.base import BaseFormatter
-
-
-class JSONFormatter(BaseFormatter):
-    """The JSON formatter.
-
-    It returns string-encoded JSON objects and does not require the
-    analysis input to generate payloads.
-    """
-
-    report_requires_input = False
-
-    @staticmethod
-    def format_group_status(resp: GroupStatusResponse) -> str:
-        """Format a group status response as compressed JSON."""
-
-        return resp.json(by_alias=True)
-
-    @staticmethod
-    def format_project_list(resp: ProjectListResponse):
-        """Format a project list response as pretty-printed JSON."""
-
-        return resp.json(by_alias=True)
-
-    @staticmethod
-    def format_group_list(resp: GroupListResponse) -> str:
-        """Format a group list response as compressed JSON."""
-
-        return resp.json(by_alias=True)
-
-    @staticmethod
-    def format_analysis_list(resp: AnalysisListResponse) -> str:
-        """Format an analysis list response as compressed JSON."""
-
-        return resp.json(by_alias=True)
-
-    @staticmethod
-    def format_analysis_status(resp: AnalysisStatusResponse) -> str:
-        """Format an analysis status response as compressed JSON."""
-
-        return resp.json(by_alias=True)
-
-    @staticmethod
-    def format_detected_issues(
-        issues_list: List[
-            Tuple[str, DetectedIssuesResponse, Optional[AnalysisInputResponse]]
-        ],
-        **kwargs,
-    ) -> str:
-        """Format an issue report response as compressed JSON."""
-
-        output = [resp.dict(by_alias=True) for _, resp, _ in issues_list]
-        return json.dumps(output)
-
-    @staticmethod
-    def format_version(resp: VersionResponse) -> str:
-        """Format a version response as compressed JSON."""
-
-        return resp.json(by_alias=True)
-
-
-class PrettyJSONFormatter(BaseFormatter):
-    """The pretty-printing JSON formatter.
-
-    It works exactly as the JSON formatter, with the difference that the
-    string- encoded JSON object is indented with two spaces for each
-    level, and the keys are sorted in alphabetical order.
-    """
-
-    report_requires_input = False
-
-    @staticmethod
-    def _print_as_json(obj, report_mode=False) -> str:
-        """Pretty-print the given object's JSON representation."""
-
-        json_args = {"indent": 2, "sort_keys": True}
-        if report_mode:
-            return json.dumps(
-                [resp.dict(by_alias=True) for _, resp, _ in obj], **json_args
-            )
-        return json.dumps(obj.dict(by_alias=True), **json_args)
-
-    @staticmethod
-    def format_project_list(resp: ProjectListResponse):
-        """Format a project list response as pretty-printed JSON."""
-
-        return PrettyJSONFormatter._print_as_json(resp)
-
-    @staticmethod
-    def format_group_status(resp: GroupStatusResponse) -> str:
-        """Format a group status response as pretty-printed JSON."""
-
-        return PrettyJSONFormatter._print_as_json(resp)
-
-    @staticmethod
-    def format_group_list(resp: GroupListResponse) -> str:
-        """Format a group list response as pretty-printed JSON."""
-
-        return PrettyJSONFormatter._print_as_json(resp)
-
-    @staticmethod
-    def format_analysis_list(obj: AnalysisListResponse) -> str:
-        """Format an analysis list response as pretty-printed JSON."""
-
-        return PrettyJSONFormatter._print_as_json(obj)
-
-    @staticmethod
-    def format_analysis_status(obj: AnalysisStatusResponse) -> str:
-        """Format an analysis status response as pretty-printed JSON."""
-
-        return PrettyJSONFormatter._print_as_json(obj)
-
-    @staticmethod
-    def format_detected_issues(
-        issues_list: List[
-            Tuple[str, DetectedIssuesResponse, Optional[AnalysisInputResponse]]
-        ],
-        **kwargs,
-    ) -> str:
-        """Format an issue report response as pretty-printed JSON."""
-
-        return PrettyJSONFormatter._print_as_json(issues_list, report_mode=True)
-
-    @staticmethod
-    def format_version(obj: VersionResponse) -> str:
-        """Format a version response as pretty-printed JSON."""
-
-        return PrettyJSONFormatter._print_as_json(obj)
diff --git a/mythx_cli/formatter/simple_stdout.py b/mythx_cli/formatter/simple_stdout.py
deleted file mode 100644
index aced448..0000000
--- a/mythx_cli/formatter/simple_stdout.py
+++ /dev/null
@@ -1,138 +0,0 @@
-"""This module contains a simple text formatter class printing a subset of the
-response data."""
-
-from typing import List, Optional, Tuple
-
-from mythx_models.response import (
-    AnalysisInputResponse,
-    AnalysisListResponse,
-    AnalysisStatusResponse,
-    DetectedIssuesResponse,
-    GroupListResponse,
-    GroupStatusResponse,
-    ProjectListResponse,
-    VersionResponse,
-)
-
-from mythx_cli.formatter.base import BaseFormatter
-from mythx_cli.util import index_by_filename
-
-
-class SimpleFormatter(BaseFormatter):
-    """The simple text formatter.
-
-    This formatter generates simplified text output. It also displays
-    the source locations of issues by line in the Solidity source code
-    if given. Therefore, this formatter requires the analysis input to
-    be given.
-    """
-
-    report_requires_input = True
-
-    @staticmethod
-    def format_analysis_list(resp: AnalysisListResponse) -> str:
-        """Format an analysis list response to a simple text representation."""
-
-        res = []
-        for analysis in resp.analyses:
-            res.append("UUID: {}".format(analysis.uuid))
-            res.append("Submitted at: {}".format(analysis.submitted_at))
-            res.append("Status: {}".format(analysis.status))
-            res.append("")
-
-        return "\n".join(res)
-
-    @staticmethod
-    def format_group_status(resp: GroupStatusResponse) -> str:
-        """Format a group status response to a simple text representation."""
-
-        res = [
-            "ID: {}".format(resp.identifier),
-            "Name: {}".format(resp.name or "<unnamed>"),
-            "Created on: {}".format(resp.created_at),
-            "Status: {}".format(resp.status),
-            "",
-        ]
-        return "\n".join(res)
-
-    @staticmethod
-    def format_group_list(resp: GroupListResponse) -> str:
-        """Format an analysis group response to a simple text
-        representation."""
-
-        res = []
-        for group in resp.groups:
-            res.append("ID: {}".format(group.identifier))
-            res.append("Name: {}".format(group.name or "<unnamed>"))
-            res.append("Created on: {}".format(group.created_at))
-            res.append("Status: {}".format(group.status))
-            res.append("")
-
-        return "\n".join(res)
-
-    @staticmethod
-    def format_project_list(resp: ProjectListResponse) -> str:
-        """Format an analysis group response to a simple text
-        representation."""
-
-        res = []
-        for project in resp.projects:
-            res.append("ID: {}".format(project.id))
-            res.append("Name: {}".format(project.name or "<unnamed>"))
-            res.append("Created on: {}".format(project.created))
-            res.append("Modified: {}".format(project.modified))
-            res.append("")
-
-        return "\n".join(res)
-
-    @staticmethod
-    def format_analysis_status(resp: AnalysisStatusResponse) -> str:
-        """Format an analysis status response to a simple text
-        representation."""
-
-        res = [
-            "UUID: {}".format(resp.uuid),
-            "Submitted at: {}".format(resp.submitted_at),
-            "Status: {}".format(resp.status),
-            "",
-        ]
-        return "\n".join(res)
-
-    @staticmethod
-    def format_detected_issues(
-        issues_list: List[
-            Tuple[str, DetectedIssuesResponse, Optional[AnalysisInputResponse]]
-        ],
-        **kwargs,
-    ) -> str:
-        """Format an issue report to a simple text representation."""
-
-        file_to_issues = index_by_filename(issues_list)
-        result = []
-
-        for filename, data in file_to_issues.items():
-            result.append(f"Report for {filename}")
-            # sort by line number
-            data = sorted([o for o in data if o["issues"]], key=lambda x: x["line"])
-            for line in data:
-                for issue in line["issues"]:
-                    result.append(f"Title: {issue['swcTitle']} ({issue['severity']})")
-                    result.append(f"Description: {issue['description']['head']}")
-                    result.append(f"Line: {line['line']}")
-                    result.append("\t" + line["content"].strip() + "\n")
-
-        return "\n".join(result)
-
-    @staticmethod
-    def format_version(resp: VersionResponse) -> str:
-        """Format a version response to a simple text representation."""
-
-        return "\n".join(
-            [
-                "API: {}".format(resp.api),
-                "Harvey: {}".format(resp.harvey),
-                "Maru: {}".format(resp.maru),
-                "Mythril: {}".format(resp.mythril),
-                "Hashed: {}".format(resp.hash),
-            ]
-        )
diff --git a/mythx_cli/formatter/tabular.py b/mythx_cli/formatter/tabular.py
deleted file mode 100644
index 3da32f3..0000000
--- a/mythx_cli/formatter/tabular.py
+++ /dev/null
@@ -1,192 +0,0 @@
-"""This module contains a tabular data formatter class printing a subset of the
-response data."""
-
-from itertools import zip_longest
-from os.path import basename
-from typing import List, Optional, Tuple
-
-from mythx_models.response import (
-    AnalysisInputResponse,
-    AnalysisListResponse,
-    AnalysisStatusResponse,
-    DetectedIssuesResponse,
-    GroupListResponse,
-    GroupStatusResponse,
-    ProjectListResponse,
-    VersionResponse,
-)
-from tabulate import tabulate
-
-from mythx_cli.formatter.base import BaseFormatter
-from mythx_cli.formatter.util import generate_dashboard_link
-from mythx_cli.util import index_by_filename
-
-
-class TabularFormatter(BaseFormatter):
-    """The tabular formatter.
-
-    This formatter displays an ASCII table. It is enabled by default and
-    requires the analysis input data to display each issue's line number
-    in the source file. It might break on very large field sizes as
-    cell-internal line breaks are not supported by the tabulate library
-    yet.
-    """
-
-    report_requires_input = True
-
-    @staticmethod
-    def format_analysis_list(resp: AnalysisListResponse) -> str:
-        """Format an analysis list response to a tabular representation."""
-
-        data = [
-            (a.uuid, a.status, a.client_tool_name, a.submitted_at)
-            for a in resp.analyses
-        ]
-        return tabulate(data, tablefmt="fancy_grid")
-
-    @staticmethod
-    def format_project_list(resp: ProjectListResponse) -> str:
-        """Format an analysis group response to a tabular representation."""
-
-        data = [
-            (project.id, project.name, project.group_count, project.modified)
-            for project in resp.projects
-        ]
-        return tabulate(data, tablefmt="fancy_grid")
-
-    @staticmethod
-    def format_group_list(resp: GroupListResponse) -> str:
-        """Format an analysis group response to a tabular representation."""
-
-        data = [
-            (
-                group.identifier,
-                group.status,
-                ",".join([basename(x) for x in group.main_source_files]),
-                group.created_at,
-            )
-            for group in resp.groups
-        ]
-        return tabulate(data, tablefmt="fancy_grid")
-
-    @staticmethod
-    def format_group_status(resp: GroupStatusResponse) -> str:
-        """Format a group status response to a tabular representation."""
-
-        data = (
-            (
-                ("ID", resp.identifier),
-                ("Name", resp.name or "<unnamed>"),
-                ("Creation Date", resp.created_at),
-                ("Created By", resp.created_by),
-                ("Progress", "{}/100".format(resp.progress)),
-            )
-            + tuple(
-                zip_longest(("Main Sources",), resp.main_source_files, fillvalue="")
-            )
-            + (
-                ("Status", resp.status.title()),
-                ("Queued Analyses", resp.analysis_statistics.queued or 0),
-                ("Running Analyses", resp.analysis_statistics.running or 0),
-                ("Failed Analyses", resp.analysis_statistics.failed or 0),
-                ("Finished Analyses", resp.analysis_statistics.finished or 0),
-                ("Total Analyses", resp.analysis_statistics.total or 0),
-                (
-                    "High Severity Vulnerabilities",
-                    resp.vulnerability_statistics.high or 0,
-                ),
-                (
-                    "Medium Severity Vulnerabilities",
-                    resp.vulnerability_statistics.medium or 0,
-                ),
-                (
-                    "Low Severity Vulnerabilities",
-                    resp.vulnerability_statistics.low or 0,
-                ),
-                (
-                    "Unknown Severity Vulnerabilities",
-                    resp.vulnerability_statistics.none or 0,
-                ),
-            )
-        )
-        return tabulate(data, tablefmt="fancy_grid")
-
-    @staticmethod
-    def format_analysis_status(resp: AnalysisStatusResponse) -> str:
-        """Format an analysis status response to a tabular representation."""
-
-        data = (
-            ("UUID", resp.uuid),
-            ("API Version", resp.api_version),
-            ("Mythril Version", resp.mythril_version),
-            ("Harvey Version", resp.harvey_version),
-            ("Maru Version", resp.maru_version),
-            ("Queue Time", resp.queue_time),
-            ("Run Time", resp.run_time),
-            ("Status", resp.status),
-            ("Submitted At", resp.submitted_at),
-            ("Submitted By", resp.submitted_by),
-            ("Tool Name", resp.client_tool_name),
-            ("Group ID", resp.group_id),
-            ("Group Name", resp.group_name),
-            ("Analysis Mode", resp.analysis_mode),
-        )
-        return tabulate(data, tablefmt="fancy_grid")
-
-    @staticmethod
-    def format_detected_issues(
-        issues_list: List[
-            Tuple[str, DetectedIssuesResponse, Optional[AnalysisInputResponse]]
-        ],
-        **kwargs,
-    ) -> str:
-        """Format an issue report to a tabular representation."""
-
-        result = []
-        file_to_issues = index_by_filename(issues_list)
-        table_sort_key = kwargs.pop("table_sort_key", "line")
-
-        for filename, data in file_to_issues.items():
-            data = [o for o in data if o["issues"]]
-            if not data:
-                continue
-            result.append(f"Report for {filename}")
-            links, lines = set(), set()
-            for line in data:
-                for issue in line["issues"]:
-                    links.add(generate_dashboard_link(issue["uuid"]))
-                    lines.add(
-                        (
-                            line["line"],
-                            f"({issue['swcID']}) {issue['swcTitle']}",
-                            issue["severity"],
-                            issue["description"]["head"],
-                        )
-                    )
-
-            # sort by line number
-            sort_idx = {"line": 0, "title": 1, "severity": 2, "description": 3}[
-                table_sort_key
-            ]
-            lines = sorted(lines, key=lambda x: x[sort_idx])
-
-            result.extend(links)
-            result.extend(
-                (
-                    tabulate(
-                        lines,
-                        tablefmt="fancy_grid",
-                        headers=("Line", "SWC Title", "Severity", "Short Description"),
-                    ),
-                    "",  # new line after table
-                )
-            )
-
-        return "\n".join(result)
-
-    @staticmethod
-    def format_version(resp: VersionResponse) -> str:
-        """Format a version response to a tabular representation."""
-
-        data = ((k.title(), v) for k, v in resp.dict(by_alias=True).items())
-        return tabulate(data, tablefmt="fancy_grid")
diff --git a/mythx_cli/formatter/util.py b/mythx_cli/formatter/util.py
deleted file mode 100644
index 6b697ec..0000000
--- a/mythx_cli/formatter/util.py
+++ /dev/null
@@ -1,116 +0,0 @@
-"""Utility functions for handling API requests and responses."""
-
-from typing import List, Union
-
-import click
-from mythx_models.response import DetectedIssuesResponse, Issue, Severity
-
-SEVERITY_ORDER = ("unknown", "none", "low", "medium", "high")
-
-
-def get_source_location_by_offset(source: str, offset: int) -> int:
-    """Retrieve the Solidity source code location based on the source map
-    offset.
-
-    :param source: The Solidity source to analyze
-    :param offset: The source map's offset
-    :return: The offset's source line number equivalent
-    """
-
-    return source.encode("utf-8")[0:offset].count("\n".encode("utf-8")) + 1
-
-
-def generate_dashboard_link(uuid: str) -> str:
-    """Generate a MythX dashboard link for an analysis job.
-
-    This method will generate a link to an analysis job on the official
-    MythX dashboard production setup. Custom deployment locations are currently
-    not supported by this function (but available at mythx.io).
-    :param uuid: The analysis job's UUID
-    :return: The analysis job's dashboard link
-    """
-    return "https://dashboard.mythx.io/#/console/analyses/{}".format(uuid)
-
-
-def normalize_swc_list(swc_list: Union[str, List[str], None]) -> List[str]:
-    """Normalize a list of SWC IDs.
-
-    This method normalizes a list of SWC ID definitions, making SWC-101, swc-101,
-    and 101 equivalent.
-    :param swc_list: The list of SWC IDs as strings
-    :return: The normalized SWC ID list as SWC-XXX
-    """
-    if not swc_list:
-        return []
-    if type(swc_list) == str:
-        swc_list = swc_list.split(",")
-    swc_list = [str(x).strip().upper() for x in swc_list]
-    swc_list = ["SWC-{}".format(x) if not x.startswith("SWC") else x for x in swc_list]
-
-    return swc_list
-
-
-def set_ci_failure() -> None:
-    """Based on the current context, set the return code to 1.
-
-    This method sets the return code to 1. It is called by the
-    respective subcommands (analyze and report) in case a severe issue
-    has been found (as specified by the user) if the CI flag is passed.
-    This will make the MythX CLI fail when running on a CI server. If no
-    context is available, this function assumes that it is running
-    outside a CLI scenario (e.g. a test setup) and will not do anything.
-    """
-    try:
-        ctx = click.get_current_context()
-        if ctx.obj["ci"]:
-            ctx.obj["retval"] = 1
-    except RuntimeError:
-        # skip failure when there is no active click context
-        # i.e. the method has been called outside the click
-        # application.
-        pass
-
-
-def filter_report(
-    resp: DetectedIssuesResponse,
-    min_severity: Union[str, Severity] = None,
-    swc_blacklist: Union[str, List[str]] = None,
-    swc_whitelist: Union[str, List[str]] = None,
-) -> DetectedIssuesResponse:
-    """Filter issues based on an SWC blacklist and minimum severity.
-
-    This will remove issues of a specific SWC ID or with a too low
-    severity from the issue reports of the passed
-    :code:`DetectedIssuesResponse` object. The SWC blacklist can be a
-    list of strings in the format "SWC-000" or a comma-separated string.
-    "SWC" is case-insensitive and normalized. The SWC whitelist works in
-    a similar way, just including selected SWCs into the resulting
-    response object.
-
-    :param resp: The issue report of an analysis job
-    :param min_severity: Ignore SWC IDs below the designated level
-    :param swc_blacklist: A comma-separated list of SWC IDs to ignore
-    :param swc_whitelist: A comma-separated list of SWC IDs to include
-    :return: The filtered issue report
-    """
-    min_severity = min_severity.lower() if min_severity else SEVERITY_ORDER[0]
-    swc_blacklist = normalize_swc_list(swc_blacklist)
-    swc_whitelist = normalize_swc_list(swc_whitelist)
-
-    new_issues = []
-    for report in resp.issue_reports:
-        for issue in report.issues:
-            issue: Issue
-            is_severe = SEVERITY_ORDER.index(
-                issue.severity.lower()
-            ) >= SEVERITY_ORDER.index(min_severity.lower())
-            not_blacklisted = issue.swc_id not in swc_blacklist
-            is_whitelisted = issue.swc_id in swc_whitelist if swc_whitelist else True
-
-            if all((is_severe, is_whitelisted, not_blacklisted)):
-                new_issues.append(issue)
-                set_ci_failure()
-
-        report.issues = new_issues
-
-    return resp
diff --git a/mythx_cli/fuzz/.DS_Store b/mythx_cli/fuzz/.DS_Store
deleted file mode 100644
index 8b98bcf..0000000
Binary files a/mythx_cli/fuzz/.DS_Store and /dev/null differ
diff --git a/mythx_cli/fuzz/ide/__init__.py b/mythx_cli/fuzz/ide/__init__.py
deleted file mode 100644
index e22e88b..0000000
--- a/mythx_cli/fuzz/ide/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from mythx_cli.fuzz.ide.brownie import BrownieJob
-from mythx_cli.fuzz.ide.generic import IDEArtifacts
diff --git a/setup.cfg b/setup.cfg
index e525d8f..96904d2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,7 +7,7 @@ tag = True
 search = version="{current_version}"
 replace = version="{new_version}"
 
-[bumpversion:file:mythx_cli/__init__.py]
+[bumpversion:file:fuzzing_cli/__init__.py]
 search = __version__ = "{current_version}"
 replace = __version__ = "{new_version}"
 
diff --git a/setup.py b/setup.py
index c43d372..2a72329 100644
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@
         "Programming Language :: Python :: Implementation :: PyPy",
     ],
     description="A command line interface for the Diligence Fuzzing API",
-    entry_points={"console_scripts": ["fuzz=mythx_cli.cli:cli"]},
+    entry_points={"console_scripts": ["fuzz=fuzzing_cli.cli:cli"]},
     install_requires=requirements,
     license="Apache-2.0 License",
     long_description=readme + "\n\n" + history,
diff --git a/tox.ini b/tox.ini
index 95178d8..2724cd5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,11 +11,11 @@ python =
 [testenv:lint]
 basepython = python
 allowlist_externals=black
-commands = black --diff --check {toxinidir}/mythx_cli {toxinidir}/tests
+commands = black --diff --check {toxinidir}/fuzzing_cli {toxinidir}/tests
 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}
 deps = -r {toxinidir}/requirements_dev.txt
 commands =
     pip install -U pip
-    pytest --cov=mythx_cli --basetemp={envtmpdir}
+    pytest --cov=fuzzing_cli --basetemp={envtmpdir}


Test patch:
diff --git a/tests/common.py b/tests/common.py
index b78d3a2..1338ef9 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -1,21 +1,10 @@
 import json
 from contextlib import contextmanager
-from copy import deepcopy
 from pathlib import Path
 from typing import List
 from unittest.mock import patch
 
-from mythx_models.response import (
-    AnalysisInputResponse,
-    AnalysisListResponse,
-    AnalysisStatusResponse,
-    AnalysisSubmissionResponse,
-    DetectedIssuesResponse,
-    GroupCreationResponse,
-    GroupListResponse,
-    GroupStatusResponse,
-    VersionResponse,
-)
+from mythx_models.response import DetectedIssuesResponse
 
 
 def get_test_case(path: str, obj=None, raw=False):
@@ -33,12 +22,9 @@ def get_test_case(path: str, obj=None, raw=False):
         return obj(**dict_data)
 
 
-AST = get_test_case("testdata/test-ast.json")
-
-
 @contextmanager
 def mock_faas_context():
-    with patch("mythx_cli.fuzz.rpc.RPCClient") as RPCClient_mock:
+    with patch("fuzzing_cli.fuzz.rpc.RPCClient") as RPCClient_mock:
         instance = RPCClient_mock.return_value
         instance.get_all_blocks.return_value = get_test_case(
             "testdata/ganache-all-blocks.json"
@@ -47,90 +33,7 @@ def mock_faas_context():
     yield
 
 
-@contextmanager
-def mock_context(
-    submission_response=None,
-    issues_response=None,
-    input_response=None,
-    analysis_list_response=None,
-    group_list_response=None,
-    analysis_status_response=None,
-    group_status_response=None,
-    group_creation_response=None,
-):
-    with patch("pythx.Client.analyze") as analyze_patch, patch(
-        "pythx.Client.analysis_ready"
-    ) as ready_patch, patch("pythx.Client.report") as report_patch, patch(
-        "pythx.Client.request_by_uuid"
-    ) as input_patch, patch(
-        "solcx.compile_source"
-    ) as compile_patch, patch(
-        "pythx.Client.analysis_list"
-    ) as analysis_list_patch, patch(
-        "pythx.Client.group_list"
-    ) as group_list_patch, patch(
-        "pythx.Client.analysis_status"
-    ) as status_patch, patch(
-        "pythx.Client.group_status"
-    ) as group_status_patch, patch(
-        "pythx.Client.create_group"
-    ) as group_create_patch, patch(
-        "pythx.Client.version"
-    ) as version_patch:
-        analyze_patch.return_value = submission_response or get_test_case(
-            "testdata/analysis-submission-response.json", AnalysisSubmissionResponse
-        )
-        ready_patch.return_value = True
-        report_patch.return_value = deepcopy(issues_response) or get_test_case(
-            "testdata/detected-issues-response.json", DetectedIssuesResponse
-        )
-        input_patch.return_value = input_response or get_test_case(
-            "testdata/analysis-input-response.json", AnalysisInputResponse
-        )
-        compile_patch.return_value = {
-            "contract": {
-                "abi": "test",
-                "ast": AST,
-                "bin": "test",
-                "bin-runtime": "test",
-                "srcmap": "test",
-                "srcmap-runtime": "test",
-            }
-        }
-        analysis_list_patch.return_value = analysis_list_response or get_test_case(
-            "testdata/analysis-list-response.json", AnalysisListResponse
-        )
-        group_list_patch.return_value = group_list_response or get_test_case(
-            "testdata/group-list-response.json", GroupListResponse
-        )
-        status_patch.return_value = analysis_status_response or get_test_case(
-            "testdata/analysis-status-response.json", AnalysisStatusResponse
-        )
-        group_status_patch.return_value = group_status_response or get_test_case(
-            "testdata/group-status-response.json", GroupStatusResponse
-        )
-        group_create_patch.return_value = group_creation_response or get_test_case(
-            "testdata/group-creation-response.json", GroupCreationResponse
-        )
-        version_patch.return_value = get_test_case(
-            "testdata/version-response.json", VersionResponse
-        )
-        yield (
-            analyze_patch,
-            ready_patch,
-            report_patch,
-            input_patch,
-            compile_patch,
-            analysis_list_patch,
-            group_list_patch,
-            status_patch,
-            group_status_patch,
-            group_create_patch,
-            version_patch,
-        )
-
-
-def generate_mythx_config(
+def generate_fuzz_config(
     base_path: str = "",
     build_directory: str = "build",
     targets: str = "contracts",
@@ -164,5 +67,5 @@ def generate_mythx_config(
 
 
 def write_config(*args, **kwargs):
-    with open(".mythx.yml", "w+") as conf_f:
-        conf_f.write(generate_mythx_config(*args, **kwargs))
+    with open(".fuzz.yml", "w+") as conf_f:
+        conf_f.write(generate_fuzz_config(*args, **kwargs))
diff --git a/tests/conftest.py b/tests/conftest.py
index cfc7113..7b1c99a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,5 +1,4 @@
 import json
-import logging
 import os
 from os import remove
 from pathlib import Path
@@ -9,12 +8,6 @@
 from tests.common import get_test_case
 
 
-def pytest_generate_tests(metafunc):
-    os.environ["MYTHX_API_KEY"] = "test"
-    for name in logging.root.manager.loggerDict:
-        logging.getLogger(name).setLevel(logging.DEBUG)
-
-
 @pytest.fixture()
 def truffle_project(tmp_path, request):
     artifact = get_test_case("testdata/truffle-artifact.json")
@@ -120,6 +113,6 @@ def hardhat_project(tmp_path, request):
 def teardown():
     yield
     try:
-        remove(".mythx.yml")
+        remove(".fuzz.yml")
     except:
         pass
diff --git a/tests/test_fuzz_brownie.py b/tests/test_fuzz_brownie.py
index c8de0b7..c0c8c48 100644
--- a/tests/test_fuzz_brownie.py
+++ b/tests/test_fuzz_brownie.py
@@ -6,10 +6,10 @@
 from click.testing import CliRunner
 from requests import RequestException
 
-from mythx_cli.cli import cli
-from mythx_cli.fuzz.exceptions import RequestError
-from mythx_cli.fuzz.faas import FaasClient
-from mythx_cli.fuzz.rpc import RPCClient
+from fuzzing_cli.cli import cli
+from fuzzing_cli.fuzz.exceptions import RequestError
+from fuzzing_cli.fuzz.faas import FaasClient
+from fuzzing_cli.fuzz.rpc import RPCClient
 
 from .common import get_test_case, write_config
 
@@ -91,10 +91,7 @@ def test_faas_not_running(tmp_path, brownie_project):
         runner = CliRunner()
         result = runner.invoke(cli, ["run", f"{tmp_path}/contracts"])
 
-    assert (
-        "Error: Unable to submit the campaign to the faas. Are you sure the service is running on"
-        in result.output
-    )
+    assert "RequestError: Error starting FaaS campaign" in result.output
     assert result.exit_code != 0
 
 
@@ -124,10 +121,7 @@ def test_faas_target_config_file(tmp_path, brownie_project):
         # we call the run command without the target parameter.
         result = runner.invoke(cli, ["run"])
 
-    assert (
-        "Error: Unable to submit the campaign to the faas. Are you sure the service is running on"
-        in result.output
-    )
+    assert "RequestError: Error starting FaaS campaign." in result.output
     assert result.exit_code != 0
 
 
@@ -275,7 +269,7 @@ def test_fuzz_subcommands_present(keyword):
     assert keyword in result.output
 
 
-@patch("mythx_cli.fuzz.scribble.ScribbleMixin.instrument_solc_in_place")
+@patch("fuzzing_cli.fuzz.scribble.ScribbleMixin.instrument_solc_in_place")
 def test_fuzz_arm(mock, tmp_path, brownie_project):
     runner = CliRunner()
     result = runner.invoke(cli, ["arm", f"{tmp_path}/contracts/sample.sol"])
@@ -290,7 +284,7 @@ def test_fuzz_arm(mock, tmp_path, brownie_project):
     assert result.exit_code == 0
 
 
-@patch("mythx_cli.fuzz.scribble.ScribbleMixin.disarm_solc_in_place")
+@patch("fuzzing_cli.fuzz.scribble.ScribbleMixin.disarm_solc_in_place")
 def test_fuzz_disarm(mock, tmp_path, brownie_project):
     runner = CliRunner()
     result = runner.invoke(cli, ["disarm", f"{tmp_path}/contracts/sample.sol"])
diff --git a/tests/test_fuzz_hardhat.py b/tests/test_fuzz_hardhat.py
index 0f69e22..9f78073 100644
--- a/tests/test_fuzz_hardhat.py
+++ b/tests/test_fuzz_hardhat.py
@@ -4,9 +4,9 @@
 import pytest
 from click.testing import CliRunner
 
-from mythx_cli.cli import cli
-from mythx_cli.fuzz.faas import FaasClient
-from mythx_cli.fuzz.rpc import RPCClient
+from fuzzing_cli.cli import cli
+from fuzzing_cli.fuzz.faas import FaasClient
+from fuzzing_cli.fuzz.rpc import RPCClient
 
 from .common import get_test_case, write_config
 
diff --git a/tests/test_fuzz_login.py b/tests/test_fuzz_login.py
index 6fe0197..8956195 100644
--- a/tests/test_fuzz_login.py
+++ b/tests/test_fuzz_login.py
@@ -4,10 +4,10 @@
 from pytest import mark
 from requests_mock import Mocker
 
-from mythx_cli.cli import cli
-from mythx_cli.fuzz.faas import FaasClient
-from mythx_cli.fuzz.rpc import RPCClient
-from mythx_cli.fuzz.run import IDE
+from fuzzing_cli.cli import cli
+from fuzzing_cli.fuzz.faas import FaasClient
+from fuzzing_cli.fuzz.rpc import RPCClient
+from fuzzing_cli.fuzz.run import IDE
 from tests.common import write_config
 
 REFRESH_TOKEN_MALFORMED_ERROR = (
@@ -15,6 +15,18 @@
 )
 
 
+class TestArtifacts:
+    def __init__(self, *args, **kwargs):
+        pass
+
+    @property
+    def payload(self):
+        return {"sources": {}, "contracts": {}}
+
+    def generate_payload(self):
+        pass
+
+
 def test_no_keys(tmp_path, truffle_project):
     runner = CliRunner()
     write_config(not_include=["api_key"])
@@ -26,9 +38,9 @@ def test_no_keys(tmp_path, truffle_project):
 
 @patch.object(RPCClient, attribute="contract_exists", new=Mock(return_value=True))
 @patch.object(RPCClient, attribute="get_seed_state", new=Mock(return_value={}))
-@patch(target="mythx_cli.fuzz.run.determine_ide", new=Mock(return_value=IDE.HARDHAT))
-@patch(target="mythx_cli.fuzz.run.HardhatJob", new=MagicMock())
-@patch(target="mythx_cli.fuzz.run.FaasClient", new=MagicMock())
+@patch(target="fuzzing_cli.fuzz.run.determine_ide", new=Mock(return_value=IDE.HARDHAT))
+@patch(target="fuzzing_cli.fuzz.run.HardhatJob", new=MagicMock())
+@patch(target="fuzzing_cli.fuzz.run.FaasClient", new=MagicMock())
 @mark.parametrize("in_config,", [False, True])
 @mark.parametrize("key_type,", ["api_key", "refresh_token"])
 def test_provide_api_key(in_config: bool, key_type: str, tmp_path, truffle_project):
@@ -56,9 +68,9 @@ def test_provide_api_key(in_config: bool, key_type: str, tmp_path, truffle_proje
 
 @patch.object(RPCClient, attribute="contract_exists", new=Mock(return_value=True))
 @patch.object(RPCClient, attribute="get_seed_state", new=Mock(return_value={}))
-@patch(target="mythx_cli.fuzz.run.determine_ide", new=Mock(return_value=IDE.HARDHAT))
-@patch(target="mythx_cli.fuzz.run.HardhatJob", new=MagicMock())
-@patch(target="mythx_cli.fuzz.run.FaasClient", new=MagicMock())
+@patch(target="fuzzing_cli.fuzz.run.determine_ide", new=Mock(return_value=IDE.HARDHAT))
+@patch(target="fuzzing_cli.fuzz.run.HardhatJob", new=MagicMock())
+@patch(target="fuzzing_cli.fuzz.run.FaasClient", new=MagicMock())
 @mark.parametrize(
     "refresh_token",
     [
@@ -83,10 +95,20 @@ def test_wrong_refresh_token(refresh_token: str, tmp_path):
 
 
 @patch.object(RPCClient, attribute="contract_exists", new=Mock(return_value=True))
-@patch.object(RPCClient, attribute="get_seed_state", new=Mock(return_value={}))
-@patch.object(FaasClient, attribute="create_faas_campaign", new=Mock())
-@patch(target="mythx_cli.fuzz.run.determine_ide", new=Mock(return_value=IDE.HARDHAT))
-@patch(target="mythx_cli.fuzz.run.HardhatJob", new=MagicMock())
+@patch.object(
+    RPCClient,
+    attribute="get_seed_state",
+    new=Mock(
+        return_value={
+            "discovery-probability-threshold": 0.0,
+            "num-cores": 1,
+            "assertion-checking-mode": 1,
+            "analysis-setup": {},
+        }
+    ),
+)
+@patch(target="fuzzing_cli.fuzz.run.determine_ide", new=Mock(return_value=IDE.HARDHAT))
+@patch(target="fuzzing_cli.fuzz.run.HardhatJob", new=Mock(wraps=TestArtifacts))
 @mark.parametrize("return_error,", [True, False])
 def test_retrieving_api_key(requests_mock: Mocker, return_error: bool, tmp_path):
     requests_mock.real_http = True
@@ -102,6 +124,11 @@ def test_retrieving_api_key(requests_mock: Mocker, return_error: bool, tmp_path)
             status_code=200,
             json={"access_token": "test_access_token"},
         )
+        requests_mock.post(
+            "http://localhost:9899/api/campaigns/?start_immediately=true",
+            status_code=200,
+            json={"id": "test-campaign-id"},
+        )
     runner = CliRunner()
     write_config(not_include=["api_key"])
     result = runner.invoke(
@@ -116,12 +143,13 @@ def test_retrieving_api_key(requests_mock: Mocker, return_error: bool, tmp_path)
 
     if return_error:
         assert result.exit_code == 1
-        assert "Authorization failed. Error: some_error" in result.exception.message
+        assert "Authorization failed. Error: some_error" in result.output
+        req = requests_mock.last_request
     else:
         assert result.exit_code == 0
         assert "You can view campaign here:" in result.output
+        req = requests_mock.request_history[0]
 
-    req = requests_mock.last_request
     assert req.method == "POST"
     assert req.url == "https://example-us.com/oauth/token"
     assert (
diff --git a/tests/test_fuzz_truffle.py b/tests/test_fuzz_truffle.py
index f986c61..6edb548 100644
--- a/tests/test_fuzz_truffle.py
+++ b/tests/test_fuzz_truffle.py
@@ -6,10 +6,10 @@
 import pytest
 from click.testing import CliRunner
 
-from mythx_cli.cli import cli
-from mythx_cli.fuzz.faas import FaasClient
-from mythx_cli.fuzz.ide.truffle import TruffleArtifacts
-from mythx_cli.fuzz.rpc import RPCClient
+from fuzzing_cli.cli import cli
+from fuzzing_cli.fuzz.faas import FaasClient
+from fuzzing_cli.fuzz.ide.truffle import TruffleArtifacts
+from fuzzing_cli.fuzz.rpc import RPCClient
 
 from .common import get_test_case, write_config
 
diff --git a/tests/test_path_sanitize.py b/tests/test_path_sanitize.py
index 86a1b35..774c62e 100644
--- a/tests/test_path_sanitize.py
+++ b/tests/test_path_sanitize.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from mythx_cli.fuzz.util import sanitize_paths
+from fuzzing_cli.fuzz.util import sanitize_paths
 
 CWD = "/home/user/work/project"
 FILE_1 = "test-1.sol"
diff --git a/tests/test_report_filter.py b/tests/test_report_filter.py
deleted file mode 100644
index 4438ca3..0000000
--- a/tests/test_report_filter.py
+++ /dev/null
@@ -1,99 +0,0 @@
-from copy import deepcopy
-
-import pytest
-from mythx_models.response import DetectedIssuesResponse
-
-from mythx_cli.formatter.util import filter_report
-
-from .common import get_test_case
-
-# contains SWC-110
-RESPONSE = get_test_case(
-    "testdata/detected-issues-response.json", DetectedIssuesResponse
-)
-
-
-@pytest.mark.parametrize(
-    "blacklist,whitelist,severity,contained",
-    (
-        # blacklist
-        ("SWC-110", "", "", False),
-        ("swc-110", "", "", False),
-        ("110", "", "", False),
-        ("SWC-110,SWC-110", "", "", False),
-        ("swc-110,swc-110", "", "", False),
-        ("110,110", "", "", False),
-        ("SWC-110,SWC-123", "", "", False),
-        ("swc-110,swc-123", "", "", False),
-        ("110,123", "", "", False),
-        ("SWC-123", "", "", True),
-        ("swc-123", "", "", True),
-        ("123", "", "", True),
-        ("invalid", "", "", True),
-        # whitelist
-        ("", "SWC-110", "", True),
-        ("", "swc-110", "", True),
-        ("", "110", "", True),
-        ("", "SWC-110,SWC-110", "", True),
-        ("", "swc-110,swc-110", "", True),
-        ("", "110,110", "", True),
-        ("", "SWC-123", "", False),
-        ("", "swc-123", "", False),
-        ("", "123", "", False),
-        ("", "SWC-110,SWC-123", "", True),
-        ("", "swc-110,swc-123", "", True),
-        ("", "110,123", "", True),
-        ("", "invalid", "", False),
-        # severity
-        ("", "", "unknown", True),
-        ("", "", "Unknown", True),
-        ("", "", "UNKNOWN", True),
-        ("", "", "none", True),
-        ("", "", "None", True),
-        ("", "", "NONE", True),
-        ("", "", "low", True),
-        ("", "", "Low", True),
-        ("", "", "LOW", True),
-        ("", "", "medium", False),
-        ("", "", "Medium", False),
-        ("", "", "MEDIUM", False),
-        ("", "", "high", False),
-        ("", "", "High", False),
-        ("", "", "HIGH", False),
-        # mixed
-        ("SWC-110", "SWC-110", "unknown", False),
-        ("swc-110", "swc-110", "unknown", False),
-        ("110", "110", "unknown", False),
-        ("SWC-110,SWC-110", "SWC-110,SWC-110", "", False),
-        ("swc-110,swc-110", "swc-110,swc-110", "", False),
-        ("110,110", "110,110", "", False),
-        ("SWC-110,SWC-123", "SWC-123", "", False),
-        ("swc-110,swc-123", "swc-123", "", False),
-        ("110,123", "123", "", False),
-        ("SWC-123", "SWC-110", "", True),
-        ("swc-123", "swc-110", "", True),
-        ("123", "110", "", True),
-        ("SWC-123", "SWC-110", "low", True),
-        ("swc-123", "swc-110", "low", True),
-        ("123", "110", "low", True),
-        ("SWC-123", "SWC-110", "medium", False),
-        ("swc-123", "swc-110", "medium", False),
-        ("123", "110", "medium", False),
-        ("invalid", "invalid", "", False),
-    ),
-)
-def test_report_filter_blacklist(blacklist, whitelist, severity, contained):
-    resp = deepcopy(RESPONSE)
-    filter_report(
-        resp, swc_blacklist=blacklist, swc_whitelist=whitelist, min_severity=severity
-    )
-
-    swc_ids = []
-    for report in resp.issue_reports:
-        for issue in report.issues:
-            swc_ids.append(issue.swc_id)
-
-    if contained:
-        assert "SWC-110" in swc_ids
-    else:
-        assert "SWC-110" not in swc_ids
diff --git a/tests/testdata/analysis-input-response.json b/tests/testdata/analysis-input-response.json
deleted file mode 100644
index 6fab0ba..0000000
--- a/tests/testdata/analysis-input-response.json
+++ /dev/null
@@ -1,2504 +0,0 @@
-{
-    "contractName": "EstateStorage",
-    "bytecode": "0x608060405234801561001057600080fd5b50610269806100206000396000f3006080604052600436106100775763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166307ecec3e811461007c5780630a354fce146100c45780633970bfd3146100ee5780637b103999146101095780639d40b850146101475780639f813b1b1461015f575b600080fd5b34801561008857600080fd5b506100b073ffffffffffffffffffffffffffffffffffffffff6004358116906024351661017a565b604080519115158252519081900360200190f35b3480156100d057600080fd5b506100dc60043561019a565b60408051918252519081900360200190f35b3480156100fa57600080fd5b506100dc6004356024356101ac565b34801561011557600080fd5b5061011e6101dc565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b34801561015357600080fd5b5061011e6004356101f8565b34801561016b57600080fd5b506100dc600435602435610220565b600660209081526000928352604080842090915290825290205460ff1681565b60026020526000908152604090205481565b6001602052816000526040600020818154811015156101c757fe5b90600052602060002001600091509150505481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60056020526000908152604090205473ffffffffffffffffffffffffffffffffffffffff1681565b6003602090815260009283526040808420909152908252902054815600a165627a7a72305820f64a07ca79d7ea541c6da153a5e58913679321b2cc8435fdddbd0735083dba550029",
-    "sourceMap": "482:970:0:-;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;482:970:0;;;;;;;",
-    "deployedBytecode": "0x6080604052600436106100775763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166307ecec3e811461007c5780630a354fce146100c45780633970bfd3146100ee5780637b103999146101095780639d40b850146101475780639f813b1b1461015f575b600080fd5b34801561008857600080fd5b506100b073ffffffffffffffffffffffffffffffffffffffff6004358116906024351661017a565b604080519115158252519081900360200190f35b3480156100d057600080fd5b506100dc60043561019a565b60408051918252519081900360200190f35b3480156100fa57600080fd5b506100dc6004356024356101ac565b34801561011557600080fd5b5061011e6101dc565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b34801561015357600080fd5b5061011e6004356101f8565b34801561016b57600080fd5b506100dc600435602435610220565b600660209081526000928352604080842090915290825290205460ff1681565b60026020526000908152604090205481565b6001602052816000526040600020818154811015156101c757fe5b90600052602060002001600091509150505481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60056020526000908152604090205473ffffffffffffffffffffffffffffffffffffffff1681565b6003602090815260009283526040808420909152908252902054815600a165627a7a72305820f64a07ca79d7ea541c6da153a5e58913679321b2cc8435fdddbd0735083dba550029",
-    "deployedSourceMap": "482:970:0:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1383:65;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1383:65:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;915:47;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;915:47:0;;;;;;;;;;;;;;;;;;;;;812:50;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;812:50:0;;;;;;;728:28;;8:9:-1;5:2;;;30:1;27;20:12;5:2;728:28:0;;;;;;;;;;;;;;;;;;;;;;;1235:50;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1235:50:0;;;;;1053:70;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;1053:70:0;;;;;;;1383:65;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;915:47::-;;;;;;;;;;;;;:::o;812:50::-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;728:28::-;;;;;;:::o;1235:50::-;;;;;;;;;;;;;;;:::o;1053:70::-;;;;;;;;;;;;;;;;;;;;;;;;:::o",
-    "mainSource": "/home/spoons/diligence/mythx-qa/land/contracts/estate/EstateStorage.sol",
-    "sources": {
-        "/home/spoons/diligence/mythx-qa/land/contracts/estate/EstateStorage.sol": {
-            "source": "pragma solidity ^0.4.23;\n\n\ncontract LANDRegistry {\n  function decodeTokenId(uint value) external pure returns (int, int);\n  function updateLandData(int x, int y, string data) external;\n  function setUpdateOperator(uint256 assetId, address operator) external;\n  function ping() public;\n  function ownerOf(uint256 tokenId) public returns (address);\n  function safeTransferFrom(address, address, uint256) public;\n  function updateOperator(uint256 landId) public returns (address);\n}\n\n\ncontract EstateStorage {\n  bytes4 internal constant InterfaceId_GetMetadata = bytes4(keccak256(\"getMetadata(uint256)\"));\n  bytes4 internal constant InterfaceId_VerifyFingerprint = bytes4(\n    keccak256(\"verifyFingerprint(uint256,bytes)\")\n  );\n\n  LANDRegistry public registry;\n\n  // From Estate to list of owned LAND ids (LANDs)\n  mapping(uint256 => uint256[]) public estateLandIds;\n\n  // From LAND id (LAND) to its owner Estate id\n  mapping(uint256 => uint256) public landIdEstate;\n\n  // From Estate id to mapping of LAND id to index on the array above (estateLandIds)\n  mapping(uint256 => mapping(uint256 => uint256)) public estateLandIndex;\n\n  // Metadata of the Estate\n  mapping(uint256 => string) internal estateData;\n\n  // Operator of the Estate\n  mapping (uint256 => address) public updateOperator;\n\n  // From account to mapping of operator to bool whether is allowed to update content or not\n  mapping(address => mapping(address => bool)) public updateManager;\n\n}\n",
-            "ast": {
-                "absolutePath": "/home/spoons/diligence/mythx-qa/land/contracts/estate/EstateStorage.sol",
-                "exportedSymbols": {
-                    "EstateStorage": [
-                        1221
-                    ],
-                    "LANDRegistry": [
-                        1175
-                    ]
-                },
-                "id": 1222,
-                "nodeType": "SourceUnit",
-                "nodes": [
-                    {
-                        "id": 1123,
-                        "literals": [
-                            "solidity",
-                            "^",
-                            "0.4",
-                            ".23"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "0:24:2"
-                    },
-                    {
-                        "baseContracts": [],
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "documentation": null,
-                        "fullyImplemented": false,
-                        "id": 1175,
-                        "linearizedBaseContracts": [
-                            1175
-                        ],
-                        "name": "LANDRegistry",
-                        "nodeType": "ContractDefinition",
-                        "nodes": [
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1132,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": true,
-                                "modifiers": [],
-                                "name": "decodeTokenId",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1126,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1125,
-                                            "name": "value",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1132,
-                                            "src": "76:10:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            },
-                                            "typeName": {
-                                                "id": 1124,
-                                                "name": "uint",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "76:4:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "75:12:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1131,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1128,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1132,
-                                            "src": "111:3:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_int256",
-                                                "typeString": "int256"
-                                            },
-                                            "typeName": {
-                                                "id": 1127,
-                                                "name": "int",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "111:3:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1130,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1132,
-                                            "src": "116:3:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_int256",
-                                                "typeString": "int256"
-                                            },
-                                            "typeName": {
-                                                "id": 1129,
-                                                "name": "int",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "116:3:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "110:10:2"
-                                },
-                                "scope": 1175,
-                                "src": "53:68:2",
-                                "stateMutability": "pure",
-                                "superFunction": null,
-                                "visibility": "external"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1141,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "updateLandData",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1139,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1134,
-                                            "name": "x",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1141,
-                                            "src": "148:5:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_int256",
-                                                "typeString": "int256"
-                                            },
-                                            "typeName": {
-                                                "id": 1133,
-                                                "name": "int",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "148:3:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1136,
-                                            "name": "y",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1141,
-                                            "src": "155:5:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_int256",
-                                                "typeString": "int256"
-                                            },
-                                            "typeName": {
-                                                "id": 1135,
-                                                "name": "int",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "155:3:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1138,
-                                            "name": "data",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1141,
-                                            "src": "162:11:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_string_calldata_ptr",
-                                                "typeString": "string"
-                                            },
-                                            "typeName": {
-                                                "id": 1137,
-                                                "name": "string",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "162:6:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_string_storage_ptr",
-                                                    "typeString": "string"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "147:27:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1140,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "183:0:2"
-                                },
-                                "scope": 1175,
-                                "src": "124:60:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "external"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1148,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "setUpdateOperator",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1146,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1143,
-                                            "name": "assetId",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1148,
-                                            "src": "214:15:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            },
-                                            "typeName": {
-                                                "id": 1142,
-                                                "name": "uint256",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "214:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1145,
-                                            "name": "operator",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1148,
-                                            "src": "231:16:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            },
-                                            "typeName": {
-                                                "id": 1144,
-                                                "name": "address",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "231:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_address",
-                                                    "typeString": "address"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "213:35:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1147,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "257:0:2"
-                                },
-                                "scope": 1175,
-                                "src": "187:71:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "external"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1151,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "ping",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1149,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "274:2:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1150,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "283:0:2"
-                                },
-                                "scope": 1175,
-                                "src": "261:23:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1158,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "ownerOf",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1154,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1153,
-                                            "name": "tokenId",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1158,
-                                            "src": "304:15:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            },
-                                            "typeName": {
-                                                "id": 1152,
-                                                "name": "uint256",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "304:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "303:17:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1157,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1156,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1158,
-                                            "src": "337:7:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            },
-                                            "typeName": {
-                                                "id": 1155,
-                                                "name": "address",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "337:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_address",
-                                                    "typeString": "address"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "336:9:2"
-                                },
-                                "scope": 1175,
-                                "src": "287:59:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1167,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "safeTransferFrom",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1165,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1160,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1167,
-                                            "src": "375:7:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            },
-                                            "typeName": {
-                                                "id": 1159,
-                                                "name": "address",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "375:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_address",
-                                                    "typeString": "address"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1162,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1167,
-                                            "src": "384:7:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            },
-                                            "typeName": {
-                                                "id": 1161,
-                                                "name": "address",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "384:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_address",
-                                                    "typeString": "address"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1164,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1167,
-                                            "src": "393:7:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            },
-                                            "typeName": {
-                                                "id": 1163,
-                                                "name": "uint256",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "393:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "374:27:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1166,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "408:0:2"
-                                },
-                                "scope": 1175,
-                                "src": "349:60:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1174,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "updateOperator",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1170,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1169,
-                                            "name": "landId",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1174,
-                                            "src": "436:14:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            },
-                                            "typeName": {
-                                                "id": 1168,
-                                                "name": "uint256",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "436:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "435:16:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1173,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1172,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1174,
-                                            "src": "468:7:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            },
-                                            "typeName": {
-                                                "id": 1171,
-                                                "name": "address",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "468:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_address",
-                                                    "typeString": "address"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "467:9:2"
-                                },
-                                "scope": 1175,
-                                "src": "412:65:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "public"
-                            }
-                        ],
-                        "scope": 1222,
-                        "src": "27:452:2"
-                    },
-                    {
-                        "baseContracts": [],
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "documentation": null,
-                        "fullyImplemented": true,
-                        "id": 1221,
-                        "linearizedBaseContracts": [
-                            1221
-                        ],
-                        "name": "EstateStorage",
-                        "nodeType": "ContractDefinition",
-                        "nodes": [
-                            {
-                                "constant": true,
-                                "id": 1182,
-                                "name": "InterfaceId_GetMetadata",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "509:92:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_bytes4",
-                                    "typeString": "bytes4"
-                                },
-                                "typeName": {
-                                    "id": 1176,
-                                    "name": "bytes4",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "509:6:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_bytes4",
-                                        "typeString": "bytes4"
-                                    }
-                                },
-                                "value": {
-                                    "argumentTypes": null,
-                                    "arguments": [
-                                        {
-                                            "argumentTypes": null,
-                                            "arguments": [
-                                                {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "6765744d657461646174612875696e7432353629",
-                                                    "id": 1179,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "string",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "577:22:2",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_stringliteral_a574cea40cdd0a08ff0bc728ff4c5c786aa5857d851fdb93fd18cd5b4db07388",
-                                                        "typeString": "literal_string \"getMetadata(uint256)\""
-                                                    },
-                                                    "value": "getMetadata(uint256)"
-                                                }
-                                            ],
-                                            "expression": {
-                                                "argumentTypes": [
-                                                    {
-                                                        "typeIdentifier": "t_stringliteral_a574cea40cdd0a08ff0bc728ff4c5c786aa5857d851fdb93fd18cd5b4db07388",
-                                                        "typeString": "literal_string \"getMetadata(uint256)\""
-                                                    }
-                                                ],
-                                                "id": 1178,
-                                                "name": "keccak256",
-                                                "nodeType": "Identifier",
-                                                "overloadedDeclarations": [],
-                                                "referencedDeclaration": 6208,
-                                                "src": "567:9:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
-                                                    "typeString": "function () pure returns (bytes32)"
-                                                }
-                                            },
-                                            "id": 1180,
-                                            "isConstant": false,
-                                            "isLValue": false,
-                                            "isPure": true,
-                                            "kind": "functionCall",
-                                            "lValueRequested": false,
-                                            "names": [],
-                                            "nodeType": "FunctionCall",
-                                            "src": "567:33:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_bytes32",
-                                                "typeString": "bytes32"
-                                            }
-                                        }
-                                    ],
-                                    "expression": {
-                                        "argumentTypes": [
-                                            {
-                                                "typeIdentifier": "t_bytes32",
-                                                "typeString": "bytes32"
-                                            }
-                                        ],
-                                        "id": 1177,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": true,
-                                        "lValueRequested": false,
-                                        "nodeType": "ElementaryTypeNameExpression",
-                                        "src": "560:6:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_type$_t_bytes4_$",
-                                            "typeString": "type(bytes4)"
-                                        },
-                                        "typeName": "bytes4"
-                                    },
-                                    "id": 1181,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": true,
-                                    "kind": "typeConversion",
-                                    "lValueRequested": false,
-                                    "names": [],
-                                    "nodeType": "FunctionCall",
-                                    "src": "560:41:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_bytes4",
-                                        "typeString": "bytes4"
-                                    }
-                                },
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": true,
-                                "id": 1189,
-                                "name": "InterfaceId_VerifyFingerprint",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "605:118:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_bytes4",
-                                    "typeString": "bytes4"
-                                },
-                                "typeName": {
-                                    "id": 1183,
-                                    "name": "bytes4",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "605:6:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_bytes4",
-                                        "typeString": "bytes4"
-                                    }
-                                },
-                                "value": {
-                                    "argumentTypes": null,
-                                    "arguments": [
-                                        {
-                                            "argumentTypes": null,
-                                            "arguments": [
-                                                {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "76657269667946696e6765727072696e742875696e743235362c627974657329",
-                                                    "id": 1186,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "string",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "684:34:2",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_stringliteral_8f9f4b63fb27ea36c52c6e650320201c8f2c6d7c1dfa95f40f5d5da523920168",
-                                                        "typeString": "literal_string \"verifyFingerprint(uint256,bytes)\""
-                                                    },
-                                                    "value": "verifyFingerprint(uint256,bytes)"
-                                                }
-                                            ],
-                                            "expression": {
-                                                "argumentTypes": [
-                                                    {
-                                                        "typeIdentifier": "t_stringliteral_8f9f4b63fb27ea36c52c6e650320201c8f2c6d7c1dfa95f40f5d5da523920168",
-                                                        "typeString": "literal_string \"verifyFingerprint(uint256,bytes)\""
-                                                    }
-                                                ],
-                                                "id": 1185,
-                                                "name": "keccak256",
-                                                "nodeType": "Identifier",
-                                                "overloadedDeclarations": [],
-                                                "referencedDeclaration": 6208,
-                                                "src": "674:9:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
-                                                    "typeString": "function () pure returns (bytes32)"
-                                                }
-                                            },
-                                            "id": 1187,
-                                            "isConstant": false,
-                                            "isLValue": false,
-                                            "isPure": true,
-                                            "kind": "functionCall",
-                                            "lValueRequested": false,
-                                            "names": [],
-                                            "nodeType": "FunctionCall",
-                                            "src": "674:45:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_bytes32",
-                                                "typeString": "bytes32"
-                                            }
-                                        }
-                                    ],
-                                    "expression": {
-                                        "argumentTypes": [
-                                            {
-                                                "typeIdentifier": "t_bytes32",
-                                                "typeString": "bytes32"
-                                            }
-                                        ],
-                                        "id": 1184,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": true,
-                                        "lValueRequested": false,
-                                        "nodeType": "ElementaryTypeNameExpression",
-                                        "src": "662:6:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_type$_t_bytes4_$",
-                                            "typeString": "type(bytes4)"
-                                        },
-                                        "typeName": "bytes4"
-                                    },
-                                    "id": 1188,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": true,
-                                    "kind": "typeConversion",
-                                    "lValueRequested": false,
-                                    "names": [],
-                                    "nodeType": "FunctionCall",
-                                    "src": "662:61:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_bytes4",
-                                        "typeString": "bytes4"
-                                    }
-                                },
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1191,
-                                "name": "registry",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "728:28:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_LANDRegistry_$1175",
-                                    "typeString": "contract LANDRegistry"
-                                },
-                                "typeName": {
-                                    "contractScope": null,
-                                    "id": 1190,
-                                    "name": "LANDRegistry",
-                                    "nodeType": "UserDefinedTypeName",
-                                    "referencedDeclaration": 1175,
-                                    "src": "728:12:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_LANDRegistry_$1175",
-                                        "typeString": "contract LANDRegistry"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1196,
-                                "name": "estateLandIds",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "812:50:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$dyn_storage_$",
-                                    "typeString": "mapping(uint256 => uint256[])"
-                                },
-                                "typeName": {
-                                    "id": 1195,
-                                    "keyType": {
-                                        "id": 1192,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "820:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "812:29:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$dyn_storage_$",
-                                        "typeString": "mapping(uint256 => uint256[])"
-                                    },
-                                    "valueType": {
-                                        "baseType": {
-                                            "id": 1193,
-                                            "name": "uint256",
-                                            "nodeType": "ElementaryTypeName",
-                                            "src": "831:7:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            }
-                                        },
-                                        "id": 1194,
-                                        "length": null,
-                                        "nodeType": "ArrayTypeName",
-                                        "src": "831:9:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
-                                            "typeString": "uint256[]"
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1200,
-                                "name": "landIdEstate",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "915:47:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
-                                    "typeString": "mapping(uint256 => uint256)"
-                                },
-                                "typeName": {
-                                    "id": 1199,
-                                    "keyType": {
-                                        "id": 1197,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "923:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "915:27:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
-                                        "typeString": "mapping(uint256 => uint256)"
-                                    },
-                                    "valueType": {
-                                        "id": 1198,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "934:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1206,
-                                "name": "estateLandIndex",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "1053:70:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_uint256_$_t_uint256_$_$",
-                                    "typeString": "mapping(uint256 => mapping(uint256 => uint256))"
-                                },
-                                "typeName": {
-                                    "id": 1205,
-                                    "keyType": {
-                                        "id": 1201,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1061:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "1053:47:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_uint256_$_t_uint256_$_$",
-                                        "typeString": "mapping(uint256 => mapping(uint256 => uint256))"
-                                    },
-                                    "valueType": {
-                                        "id": 1204,
-                                        "keyType": {
-                                            "id": 1202,
-                                            "name": "uint256",
-                                            "nodeType": "ElementaryTypeName",
-                                            "src": "1080:7:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            }
-                                        },
-                                        "nodeType": "Mapping",
-                                        "src": "1072:27:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
-                                            "typeString": "mapping(uint256 => uint256)"
-                                        },
-                                        "valueType": {
-                                            "id": 1203,
-                                            "name": "uint256",
-                                            "nodeType": "ElementaryTypeName",
-                                            "src": "1091:7:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            }
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1210,
-                                "name": "estateData",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "1156:46:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_string_storage_$",
-                                    "typeString": "mapping(uint256 => string)"
-                                },
-                                "typeName": {
-                                    "id": 1209,
-                                    "keyType": {
-                                        "id": 1207,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1164:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "1156:26:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_string_storage_$",
-                                        "typeString": "mapping(uint256 => string)"
-                                    },
-                                    "valueType": {
-                                        "id": 1208,
-                                        "name": "string",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1175:6:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_string_storage_ptr",
-                                            "typeString": "string"
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1214,
-                                "name": "updateOperator",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "1235:50:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_address_$",
-                                    "typeString": "mapping(uint256 => address)"
-                                },
-                                "typeName": {
-                                    "id": 1213,
-                                    "keyType": {
-                                        "id": 1211,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1244:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "1235:28:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_address_$",
-                                        "typeString": "mapping(uint256 => address)"
-                                    },
-                                    "valueType": {
-                                        "id": 1212,
-                                        "name": "address",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1255:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1220,
-                                "name": "updateManager",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "1383:65:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
-                                    "typeString": "mapping(address => mapping(address => bool))"
-                                },
-                                "typeName": {
-                                    "id": 1219,
-                                    "keyType": {
-                                        "id": 1215,
-                                        "name": "address",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1391:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "1383:44:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
-                                        "typeString": "mapping(address => mapping(address => bool))"
-                                    },
-                                    "valueType": {
-                                        "id": 1218,
-                                        "keyType": {
-                                            "id": 1216,
-                                            "name": "address",
-                                            "nodeType": "ElementaryTypeName",
-                                            "src": "1410:7:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            }
-                                        },
-                                        "nodeType": "Mapping",
-                                        "src": "1402:24:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
-                                            "typeString": "mapping(address => bool)"
-                                        },
-                                        "valueType": {
-                                            "id": 1217,
-                                            "name": "bool",
-                                            "nodeType": "ElementaryTypeName",
-                                            "src": "1421:4:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_bool",
-                                                "typeString": "bool"
-                                            }
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            }
-                        ],
-                        "scope": 1222,
-                        "src": "482:970:2"
-                    }
-                ],
-                "src": "0:1453:2"
-            },
-            "legacyAST": {
-                "absolutePath": "/home/spoons/diligence/mythx-qa/land/contracts/estate/EstateStorage.sol",
-                "exportedSymbols": {
-                    "EstateStorage": [
-                        1221
-                    ],
-                    "LANDRegistry": [
-                        1175
-                    ]
-                },
-                "id": 1222,
-                "nodeType": "SourceUnit",
-                "nodes": [
-                    {
-                        "id": 1123,
-                        "literals": [
-                            "solidity",
-                            "^",
-                            "0.4",
-                            ".23"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "0:24:2"
-                    },
-                    {
-                        "baseContracts": [],
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "documentation": null,
-                        "fullyImplemented": false,
-                        "id": 1175,
-                        "linearizedBaseContracts": [
-                            1175
-                        ],
-                        "name": "LANDRegistry",
-                        "nodeType": "ContractDefinition",
-                        "nodes": [
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1132,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": true,
-                                "modifiers": [],
-                                "name": "decodeTokenId",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1126,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1125,
-                                            "name": "value",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1132,
-                                            "src": "76:10:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            },
-                                            "typeName": {
-                                                "id": 1124,
-                                                "name": "uint",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "76:4:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "75:12:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1131,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1128,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1132,
-                                            "src": "111:3:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_int256",
-                                                "typeString": "int256"
-                                            },
-                                            "typeName": {
-                                                "id": 1127,
-                                                "name": "int",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "111:3:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1130,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1132,
-                                            "src": "116:3:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_int256",
-                                                "typeString": "int256"
-                                            },
-                                            "typeName": {
-                                                "id": 1129,
-                                                "name": "int",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "116:3:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "110:10:2"
-                                },
-                                "scope": 1175,
-                                "src": "53:68:2",
-                                "stateMutability": "pure",
-                                "superFunction": null,
-                                "visibility": "external"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1141,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "updateLandData",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1139,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1134,
-                                            "name": "x",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1141,
-                                            "src": "148:5:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_int256",
-                                                "typeString": "int256"
-                                            },
-                                            "typeName": {
-                                                "id": 1133,
-                                                "name": "int",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "148:3:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1136,
-                                            "name": "y",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1141,
-                                            "src": "155:5:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_int256",
-                                                "typeString": "int256"
-                                            },
-                                            "typeName": {
-                                                "id": 1135,
-                                                "name": "int",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "155:3:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1138,
-                                            "name": "data",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1141,
-                                            "src": "162:11:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_string_calldata_ptr",
-                                                "typeString": "string"
-                                            },
-                                            "typeName": {
-                                                "id": 1137,
-                                                "name": "string",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "162:6:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_string_storage_ptr",
-                                                    "typeString": "string"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "147:27:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1140,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "183:0:2"
-                                },
-                                "scope": 1175,
-                                "src": "124:60:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "external"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1148,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "setUpdateOperator",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1146,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1143,
-                                            "name": "assetId",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1148,
-                                            "src": "214:15:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            },
-                                            "typeName": {
-                                                "id": 1142,
-                                                "name": "uint256",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "214:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1145,
-                                            "name": "operator",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1148,
-                                            "src": "231:16:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            },
-                                            "typeName": {
-                                                "id": 1144,
-                                                "name": "address",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "231:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_address",
-                                                    "typeString": "address"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "213:35:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1147,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "257:0:2"
-                                },
-                                "scope": 1175,
-                                "src": "187:71:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "external"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1151,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "ping",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1149,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "274:2:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1150,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "283:0:2"
-                                },
-                                "scope": 1175,
-                                "src": "261:23:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1158,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "ownerOf",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1154,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1153,
-                                            "name": "tokenId",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1158,
-                                            "src": "304:15:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            },
-                                            "typeName": {
-                                                "id": 1152,
-                                                "name": "uint256",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "304:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "303:17:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1157,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1156,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1158,
-                                            "src": "337:7:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            },
-                                            "typeName": {
-                                                "id": 1155,
-                                                "name": "address",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "337:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_address",
-                                                    "typeString": "address"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "336:9:2"
-                                },
-                                "scope": 1175,
-                                "src": "287:59:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1167,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "safeTransferFrom",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1165,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1160,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1167,
-                                            "src": "375:7:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            },
-                                            "typeName": {
-                                                "id": 1159,
-                                                "name": "address",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "375:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_address",
-                                                    "typeString": "address"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1162,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1167,
-                                            "src": "384:7:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            },
-                                            "typeName": {
-                                                "id": 1161,
-                                                "name": "address",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "384:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_address",
-                                                    "typeString": "address"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        },
-                                        {
-                                            "constant": false,
-                                            "id": 1164,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1167,
-                                            "src": "393:7:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            },
-                                            "typeName": {
-                                                "id": 1163,
-                                                "name": "uint256",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "393:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "374:27:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1166,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "408:0:2"
-                                },
-                                "scope": 1175,
-                                "src": "349:60:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "body": null,
-                                "documentation": null,
-                                "id": 1174,
-                                "implemented": false,
-                                "isConstructor": false,
-                                "isDeclaredConst": false,
-                                "modifiers": [],
-                                "name": "updateOperator",
-                                "nodeType": "FunctionDefinition",
-                                "parameters": {
-                                    "id": 1170,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1169,
-                                            "name": "landId",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1174,
-                                            "src": "436:14:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            },
-                                            "typeName": {
-                                                "id": 1168,
-                                                "name": "uint256",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "436:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_uint256",
-                                                    "typeString": "uint256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "435:16:2"
-                                },
-                                "payable": false,
-                                "returnParameters": {
-                                    "id": 1173,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 1172,
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "scope": 1174,
-                                            "src": "468:7:2",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            },
-                                            "typeName": {
-                                                "id": 1171,
-                                                "name": "address",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "468:7:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_address",
-                                                    "typeString": "address"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "467:9:2"
-                                },
-                                "scope": 1175,
-                                "src": "412:65:2",
-                                "stateMutability": "nonpayable",
-                                "superFunction": null,
-                                "visibility": "public"
-                            }
-                        ],
-                        "scope": 1222,
-                        "src": "27:452:2"
-                    },
-                    {
-                        "baseContracts": [],
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "documentation": null,
-                        "fullyImplemented": true,
-                        "id": 1221,
-                        "linearizedBaseContracts": [
-                            1221
-                        ],
-                        "name": "EstateStorage",
-                        "nodeType": "ContractDefinition",
-                        "nodes": [
-                            {
-                                "constant": true,
-                                "id": 1182,
-                                "name": "InterfaceId_GetMetadata",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "509:92:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_bytes4",
-                                    "typeString": "bytes4"
-                                },
-                                "typeName": {
-                                    "id": 1176,
-                                    "name": "bytes4",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "509:6:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_bytes4",
-                                        "typeString": "bytes4"
-                                    }
-                                },
-                                "value": {
-                                    "argumentTypes": null,
-                                    "arguments": [
-                                        {
-                                            "argumentTypes": null,
-                                            "arguments": [
-                                                {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "6765744d657461646174612875696e7432353629",
-                                                    "id": 1179,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "string",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "577:22:2",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_stringliteral_a574cea40cdd0a08ff0bc728ff4c5c786aa5857d851fdb93fd18cd5b4db07388",
-                                                        "typeString": "literal_string \"getMetadata(uint256)\""
-                                                    },
-                                                    "value": "getMetadata(uint256)"
-                                                }
-                                            ],
-                                            "expression": {
-                                                "argumentTypes": [
-                                                    {
-                                                        "typeIdentifier": "t_stringliteral_a574cea40cdd0a08ff0bc728ff4c5c786aa5857d851fdb93fd18cd5b4db07388",
-                                                        "typeString": "literal_string \"getMetadata(uint256)\""
-                                                    }
-                                                ],
-                                                "id": 1178,
-                                                "name": "keccak256",
-                                                "nodeType": "Identifier",
-                                                "overloadedDeclarations": [],
-                                                "referencedDeclaration": 6208,
-                                                "src": "567:9:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
-                                                    "typeString": "function () pure returns (bytes32)"
-                                                }
-                                            },
-                                            "id": 1180,
-                                            "isConstant": false,
-                                            "isLValue": false,
-                                            "isPure": true,
-                                            "kind": "functionCall",
-                                            "lValueRequested": false,
-                                            "names": [],
-                                            "nodeType": "FunctionCall",
-                                            "src": "567:33:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_bytes32",
-                                                "typeString": "bytes32"
-                                            }
-                                        }
-                                    ],
-                                    "expression": {
-                                        "argumentTypes": [
-                                            {
-                                                "typeIdentifier": "t_bytes32",
-                                                "typeString": "bytes32"
-                                            }
-                                        ],
-                                        "id": 1177,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": true,
-                                        "lValueRequested": false,
-                                        "nodeType": "ElementaryTypeNameExpression",
-                                        "src": "560:6:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_type$_t_bytes4_$",
-                                            "typeString": "type(bytes4)"
-                                        },
-                                        "typeName": "bytes4"
-                                    },
-                                    "id": 1181,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": true,
-                                    "kind": "typeConversion",
-                                    "lValueRequested": false,
-                                    "names": [],
-                                    "nodeType": "FunctionCall",
-                                    "src": "560:41:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_bytes4",
-                                        "typeString": "bytes4"
-                                    }
-                                },
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": true,
-                                "id": 1189,
-                                "name": "InterfaceId_VerifyFingerprint",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "605:118:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_bytes4",
-                                    "typeString": "bytes4"
-                                },
-                                "typeName": {
-                                    "id": 1183,
-                                    "name": "bytes4",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "605:6:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_bytes4",
-                                        "typeString": "bytes4"
-                                    }
-                                },
-                                "value": {
-                                    "argumentTypes": null,
-                                    "arguments": [
-                                        {
-                                            "argumentTypes": null,
-                                            "arguments": [
-                                                {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "76657269667946696e6765727072696e742875696e743235362c627974657329",
-                                                    "id": 1186,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "string",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "684:34:2",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_stringliteral_8f9f4b63fb27ea36c52c6e650320201c8f2c6d7c1dfa95f40f5d5da523920168",
-                                                        "typeString": "literal_string \"verifyFingerprint(uint256,bytes)\""
-                                                    },
-                                                    "value": "verifyFingerprint(uint256,bytes)"
-                                                }
-                                            ],
-                                            "expression": {
-                                                "argumentTypes": [
-                                                    {
-                                                        "typeIdentifier": "t_stringliteral_8f9f4b63fb27ea36c52c6e650320201c8f2c6d7c1dfa95f40f5d5da523920168",
-                                                        "typeString": "literal_string \"verifyFingerprint(uint256,bytes)\""
-                                                    }
-                                                ],
-                                                "id": 1185,
-                                                "name": "keccak256",
-                                                "nodeType": "Identifier",
-                                                "overloadedDeclarations": [],
-                                                "referencedDeclaration": 6208,
-                                                "src": "674:9:2",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
-                                                    "typeString": "function () pure returns (bytes32)"
-                                                }
-                                            },
-                                            "id": 1187,
-                                            "isConstant": false,
-                                            "isLValue": false,
-                                            "isPure": true,
-                                            "kind": "functionCall",
-                                            "lValueRequested": false,
-                                            "names": [],
-                                            "nodeType": "FunctionCall",
-                                            "src": "674:45:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_bytes32",
-                                                "typeString": "bytes32"
-                                            }
-                                        }
-                                    ],
-                                    "expression": {
-                                        "argumentTypes": [
-                                            {
-                                                "typeIdentifier": "t_bytes32",
-                                                "typeString": "bytes32"
-                                            }
-                                        ],
-                                        "id": 1184,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": true,
-                                        "lValueRequested": false,
-                                        "nodeType": "ElementaryTypeNameExpression",
-                                        "src": "662:6:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_type$_t_bytes4_$",
-                                            "typeString": "type(bytes4)"
-                                        },
-                                        "typeName": "bytes4"
-                                    },
-                                    "id": 1188,
-                                    "isConstant": false,
-                                    "isLValue": false,
-                                    "isPure": true,
-                                    "kind": "typeConversion",
-                                    "lValueRequested": false,
-                                    "names": [],
-                                    "nodeType": "FunctionCall",
-                                    "src": "662:61:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_bytes4",
-                                        "typeString": "bytes4"
-                                    }
-                                },
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1191,
-                                "name": "registry",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "728:28:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_contract$_LANDRegistry_$1175",
-                                    "typeString": "contract LANDRegistry"
-                                },
-                                "typeName": {
-                                    "contractScope": null,
-                                    "id": 1190,
-                                    "name": "LANDRegistry",
-                                    "nodeType": "UserDefinedTypeName",
-                                    "referencedDeclaration": 1175,
-                                    "src": "728:12:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_contract$_LANDRegistry_$1175",
-                                        "typeString": "contract LANDRegistry"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1196,
-                                "name": "estateLandIds",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "812:50:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$dyn_storage_$",
-                                    "typeString": "mapping(uint256 => uint256[])"
-                                },
-                                "typeName": {
-                                    "id": 1195,
-                                    "keyType": {
-                                        "id": 1192,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "820:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "812:29:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$dyn_storage_$",
-                                        "typeString": "mapping(uint256 => uint256[])"
-                                    },
-                                    "valueType": {
-                                        "baseType": {
-                                            "id": 1193,
-                                            "name": "uint256",
-                                            "nodeType": "ElementaryTypeName",
-                                            "src": "831:7:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            }
-                                        },
-                                        "id": 1194,
-                                        "length": null,
-                                        "nodeType": "ArrayTypeName",
-                                        "src": "831:9:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
-                                            "typeString": "uint256[]"
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1200,
-                                "name": "landIdEstate",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "915:47:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
-                                    "typeString": "mapping(uint256 => uint256)"
-                                },
-                                "typeName": {
-                                    "id": 1199,
-                                    "keyType": {
-                                        "id": 1197,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "923:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "915:27:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
-                                        "typeString": "mapping(uint256 => uint256)"
-                                    },
-                                    "valueType": {
-                                        "id": 1198,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "934:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1206,
-                                "name": "estateLandIndex",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "1053:70:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_uint256_$_t_uint256_$_$",
-                                    "typeString": "mapping(uint256 => mapping(uint256 => uint256))"
-                                },
-                                "typeName": {
-                                    "id": 1205,
-                                    "keyType": {
-                                        "id": 1201,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1061:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "1053:47:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_uint256_$_t_uint256_$_$",
-                                        "typeString": "mapping(uint256 => mapping(uint256 => uint256))"
-                                    },
-                                    "valueType": {
-                                        "id": 1204,
-                                        "keyType": {
-                                            "id": 1202,
-                                            "name": "uint256",
-                                            "nodeType": "ElementaryTypeName",
-                                            "src": "1080:7:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            }
-                                        },
-                                        "nodeType": "Mapping",
-                                        "src": "1072:27:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
-                                            "typeString": "mapping(uint256 => uint256)"
-                                        },
-                                        "valueType": {
-                                            "id": 1203,
-                                            "name": "uint256",
-                                            "nodeType": "ElementaryTypeName",
-                                            "src": "1091:7:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_uint256",
-                                                "typeString": "uint256"
-                                            }
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1210,
-                                "name": "estateData",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "1156:46:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_string_storage_$",
-                                    "typeString": "mapping(uint256 => string)"
-                                },
-                                "typeName": {
-                                    "id": 1209,
-                                    "keyType": {
-                                        "id": 1207,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1164:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "1156:26:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_string_storage_$",
-                                        "typeString": "mapping(uint256 => string)"
-                                    },
-                                    "valueType": {
-                                        "id": 1208,
-                                        "name": "string",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1175:6:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_string_storage_ptr",
-                                            "typeString": "string"
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1214,
-                                "name": "updateOperator",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "1235:50:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_uint256_$_t_address_$",
-                                    "typeString": "mapping(uint256 => address)"
-                                },
-                                "typeName": {
-                                    "id": 1213,
-                                    "keyType": {
-                                        "id": 1211,
-                                        "name": "uint256",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1244:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "1235:28:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_uint256_$_t_address_$",
-                                        "typeString": "mapping(uint256 => address)"
-                                    },
-                                    "valueType": {
-                                        "id": 1212,
-                                        "name": "address",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1255:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1220,
-                                "name": "updateManager",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1221,
-                                "src": "1383:65:2",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
-                                    "typeString": "mapping(address => mapping(address => bool))"
-                                },
-                                "typeName": {
-                                    "id": 1219,
-                                    "keyType": {
-                                        "id": 1215,
-                                        "name": "address",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "1391:7:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_address",
-                                            "typeString": "address"
-                                        }
-                                    },
-                                    "nodeType": "Mapping",
-                                    "src": "1383:44:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
-                                        "typeString": "mapping(address => mapping(address => bool))"
-                                    },
-                                    "valueType": {
-                                        "id": 1218,
-                                        "keyType": {
-                                            "id": 1216,
-                                            "name": "address",
-                                            "nodeType": "ElementaryTypeName",
-                                            "src": "1410:7:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_address",
-                                                "typeString": "address"
-                                            }
-                                        },
-                                        "nodeType": "Mapping",
-                                        "src": "1402:24:2",
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
-                                            "typeString": "mapping(address => bool)"
-                                        },
-                                        "valueType": {
-                                            "id": 1217,
-                                            "name": "bool",
-                                            "nodeType": "ElementaryTypeName",
-                                            "src": "1421:4:2",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_bool",
-                                                "typeString": "bool"
-                                            }
-                                        }
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "public"
-                            }
-                        ],
-                        "scope": 1222,
-                        "src": "482:970:2"
-                    }
-                ],
-                "src": "0:1453:2"
-            }
-        }
-    },
-    "sourceList": [
-        "/home/spoons/diligence/mythx-qa/land/contracts/estate/EstateStorage.sol"
-    ],
-    "version": "0.4.24+commit.e67f0147.Emscripten.clang",
-    "analysisMode": "quick"
-}
diff --git a/tests/testdata/analysis-list-response.json b/tests/testdata/analysis-list-response.json
deleted file mode 100644
index 8b4390c..0000000
--- a/tests/testdata/analysis-list-response.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "analyses": [
-        {
-            "uuid": "ed6b2347-68b7-4ef3-b85c-4340ae404867",
-            "apiVersion": "v1.4.33-37-g0fb1a8f",
-            "mythrilVersion": "0.21.14",
-            "harveyVersion": "0.0.34",
-            "maruVersion": "0.5.4",
-            "queueTime": 1400,
-            "runTime": 4267,
-            "status": "Finished",
-            "submittedAt": "2019-09-10T17:15:11.267Z",
-            "submittedBy": "5d6fca7fef1fc700129b6efa",
-            "clientToolName": "pythx",
-            "groupId": "5dc410095e78890011fba1a4",
-            "groupName": "test-group",
-            "analysisMode": "full"
-        },
-        {
-            "uuid": "e6566fc9-ebc1-4d04-ae5d-6f3b1873290a",
-            "apiVersion": "v1.4.33-37-g0fb1a8f",
-            "mythrilVersion": "0.21.14",
-            "harveyVersion": "0.0.34",
-            "maruVersion": "0.5.4",
-            "queueTime": 2015,
-            "runTime": 28427,
-            "status": "Finished",
-            "submittedAt": "2019-09-10T17:15:10.645Z",
-            "submittedBy": "5d6fca7fef1fc700129b6efa",
-            "clientToolName": "pythx",
-            "groupId": "5dc410095e78890011fba1a5",
-            "groupName": "test-group",
-            "analysisMode": "full"
-        },
-        {
-            "uuid": "b87f0174-ef09-4fac-9d3c-97c3fdf01782",
-            "apiVersion": "v1.4.33-37-g0fb1a8f",
-            "mythrilVersion": "0.21.14",
-            "harveyVersion": "0.0.34",
-            "maruVersion": "0.5.4",
-            "queueTime": 2816,
-            "runTime": 52405,
-            "status": "Finished",
-            "submittedAt": "2019-09-10T17:15:09.836Z",
-            "submittedBy": "5d6fca7fef1fc700129b6efa",
-            "clientToolName": "pythx",
-            "groupId": "5dc410095e78890011fba1a6",
-            "groupName": "test-group",
-            "analysisMode": "full"
-        },
-        {
-            "uuid": "2056caf6-25d7-4ce8-a633-d10a8746d5dd",
-            "apiVersion": "v1.4.33-37-g0fb1a8f",
-            "mythrilVersion": "0.21.14",
-            "harveyVersion": "0.0.34",
-            "maruVersion": "0.5.4",
-            "queueTime": 80698393,
-            "runTime": -80698393,
-            "status": "Finished",
-            "submittedAt": "2019-09-10T17:12:42.341Z",
-            "submittedBy": "5d6fca7fef1fc700129b6efa",
-            "clientToolName": "pythx",
-            "groupId": "5dc410095e78890011fba1a7",
-            "groupName": "test-group",
-            "analysisMode": "full"
-        },
-        {
-            "uuid": "63eb5611-ba4b-46e8-9e40-f735a0b86fd9",
-            "apiVersion": "v1.4.33-37-g0fb1a8f",
-            "mythrilVersion": "0.21.14",
-            "harveyVersion": "0.0.34",
-            "maruVersion": "0.5.4",
-            "queueTime": 1158,
-            "runTime": 130267,
-            "status": "Finished",
-            "submittedAt": "2019-09-10T17:12:41.645Z",
-            "submittedBy": "5d6fca7fef1fc700129b6efa",
-            "clientToolName": "pythx",
-            "groupId": "5dc410095e78890011fba1a8",
-            "groupName": "test-group",
-            "analysisMode": "full"
-        }
-    ],
-    "total": 5
-}
diff --git a/tests/testdata/analysis-list-simple.txt b/tests/testdata/analysis-list-simple.txt
deleted file mode 100644
index 72a7434..0000000
--- a/tests/testdata/analysis-list-simple.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-UUID: ed6b2347-68b7-4ef3-b85c-4340ae404867
-Submitted at: 2019-09-10T17:15:11.267Z
-Status: Finished
-
-UUID: e6566fc9-ebc1-4d04-ae5d-6f3b1873290a
-Submitted at: 2019-09-10T17:15:10.645Z
-Status: Finished
-
-UUID: b87f0174-ef09-4fac-9d3c-97c3fdf01782
-Submitted at: 2019-09-10T17:15:09.836Z
-Status: Finished
-
-UUID: 2056caf6-25d7-4ce8-a633-d10a8746d5dd
-Submitted at: 2019-09-10T17:12:42.341Z
-Status: Finished
-
-UUID: 63eb5611-ba4b-46e8-9e40-f735a0b86fd9
-Submitted at: 2019-09-10T17:12:41.645Z
-Status: Finished
-
diff --git a/tests/testdata/analysis-list-table.txt b/tests/testdata/analysis-list-table.txt
deleted file mode 100644
index 0f051cf..0000000
--- a/tests/testdata/analysis-list-table.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-╒══════════════════════════════════════╤══════════╤═══════╤══════════════════════════╕
-│ ed6b2347-68b7-4ef3-b85c-4340ae404867 │ Finished │ pythx │ 2019-09-10T17:15:11.267Z │
-├──────────────────────────────────────┼──────────┼───────┼──────────────────────────┤
-│ e6566fc9-ebc1-4d04-ae5d-6f3b1873290a │ Finished │ pythx │ 2019-09-10T17:15:10.645Z │
-├──────────────────────────────────────┼──────────┼───────┼──────────────────────────┤
-│ b87f0174-ef09-4fac-9d3c-97c3fdf01782 │ Finished │ pythx │ 2019-09-10T17:15:09.836Z │
-├──────────────────────────────────────┼──────────┼───────┼──────────────────────────┤
-│ 2056caf6-25d7-4ce8-a633-d10a8746d5dd │ Finished │ pythx │ 2019-09-10T17:12:42.341Z │
-├──────────────────────────────────────┼──────────┼───────┼──────────────────────────┤
-│ 63eb5611-ba4b-46e8-9e40-f735a0b86fd9 │ Finished │ pythx │ 2019-09-10T17:12:41.645Z │
-╘══════════════════════════════════════╧══════════╧═══════╧══════════════════════════╛
diff --git a/tests/testdata/analysis-status-response.json b/tests/testdata/analysis-status-response.json
deleted file mode 100644
index 267b805..0000000
--- a/tests/testdata/analysis-status-response.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "uuid": "ab9092f7-54d0-480f-9b63-1bb1508280e2",
-    "apiVersion": "v1.4.33-1-g1a235db",
-    "mythrilVersion": "0.21.14",
-    "harveyVersion": "0.0.34",
-    "maruVersion": "0.5.4",
-    "queueTime": 507,
-    "runTime": 30307,
-    "status": "Finished",
-    "submittedAt": "2019-09-05T20:34:27.606Z",
-    "submittedBy": "5d6fca7fef1fc700129b6efa",
-    "clientToolName": "pythx",
-    "groupId": "5dc410095e78890011fba1a4",
-    "groupName": "test-group",
-    "analysisMode": "full",
-    "numSources": 0,
-    "numVulnerabilities": {
-        "high": 0,
-        "medium": 0,
-        "low": 0,
-        "none": 0
-    },
-    "mainSource": "test.sol"
-}
diff --git a/tests/testdata/analysis-status-simple.txt b/tests/testdata/analysis-status-simple.txt
deleted file mode 100644
index 1302450..0000000
--- a/tests/testdata/analysis-status-simple.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-UUID: ab9092f7-54d0-480f-9b63-1bb1508280e2
-Submitted at: 2019-09-05T20:34:27.606Z
-Status: Finished
-
diff --git a/tests/testdata/analysis-status-table.txt b/tests/testdata/analysis-status-table.txt
deleted file mode 100644
index 3af9ae9..0000000
--- a/tests/testdata/analysis-status-table.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-╒═════════════════╤══════════════════════════════════════╕
-│ UUID            │ ab9092f7-54d0-480f-9b63-1bb1508280e2 │
-├─────────────────┼──────────────────────────────────────┤
-│ API Version     │ v1.4.33-1-g1a235db                   │
-├─────────────────┼──────────────────────────────────────┤
-│ Mythril Version │ 0.21.14                              │
-├─────────────────┼──────────────────────────────────────┤
-│ Harvey Version  │ 0.0.34                               │
-├─────────────────┼──────────────────────────────────────┤
-│ Maru Version    │ 0.5.4                                │
-├─────────────────┼──────────────────────────────────────┤
-│ Queue Time      │ 507                                  │
-├─────────────────┼──────────────────────────────────────┤
-│ Run Time        │ 30307                                │
-├─────────────────┼──────────────────────────────────────┤
-│ Status          │ Finished                             │
-├─────────────────┼──────────────────────────────────────┤
-│ Submitted At    │ 2019-09-05T20:34:27.606Z             │
-├─────────────────┼──────────────────────────────────────┤
-│ Submitted By    │ 5d6fca7fef1fc700129b6efa             │
-├─────────────────┼──────────────────────────────────────┤
-│ Tool Name       │ pythx                                │
-├─────────────────┼──────────────────────────────────────┤
-│ Group ID        │ 5dc410095e78890011fba1a4             │
-├─────────────────┼──────────────────────────────────────┤
-│ Group Name      │ test-group                           │
-├─────────────────┼──────────────────────────────────────┤
-│ Analysis Mode   │ full                                 │
-╘═════════════════╧══════════════════════════════════════╛
diff --git a/tests/testdata/analysis-submission-response.json b/tests/testdata/analysis-submission-response.json
deleted file mode 100644
index 267b805..0000000
--- a/tests/testdata/analysis-submission-response.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "uuid": "ab9092f7-54d0-480f-9b63-1bb1508280e2",
-    "apiVersion": "v1.4.33-1-g1a235db",
-    "mythrilVersion": "0.21.14",
-    "harveyVersion": "0.0.34",
-    "maruVersion": "0.5.4",
-    "queueTime": 507,
-    "runTime": 30307,
-    "status": "Finished",
-    "submittedAt": "2019-09-05T20:34:27.606Z",
-    "submittedBy": "5d6fca7fef1fc700129b6efa",
-    "clientToolName": "pythx",
-    "groupId": "5dc410095e78890011fba1a4",
-    "groupName": "test-group",
-    "analysisMode": "full",
-    "numSources": 0,
-    "numVulnerabilities": {
-        "high": 0,
-        "medium": 0,
-        "low": 0,
-        "none": 0
-    },
-    "mainSource": "test.sol"
-}
diff --git a/tests/testdata/detected-issues-response.json b/tests/testdata/detected-issues-response.json
deleted file mode 100644
index 78479b0..0000000
--- a/tests/testdata/detected-issues-response.json
+++ /dev/null
@@ -1,221 +0,0 @@
-[
-    {
-        "issues": [
-            {
-                "swcID": "SWC-110",
-                "swcTitle": "Assert Violation",
-                "description": {
-                    "head": "A reachable exception has been detected.",
-                    "tail": "It is possible to trigger an exception (opcode 0xfe). Exceptions can be caused by type errors, division by zero, out-of-bounds array access, or assert violations. Note that explicit `assert()` should only be used to check invariants. Use `require()` for regular input checking."
-                },
-                "severity": "Low",
-                "decodedLocations": [
-                    [
-                        {
-                            "line": 1,
-                            "column": 10
-                        },
-                        {
-                            "line": 1,
-                            "column": 11
-                        },
-                        false
-                    ],
-                    [
-                        {
-                            "line": 1,
-                            "column": 10
-                        },
-                        {
-                            "line": 1,
-                            "column": 11
-                        },
-                        false
-                    ]
-                ],
-                "locations": [
-                    {
-                        "sourceMap": "454:1:1",
-                        "sourceType": "raw-bytecode",
-                        "sourceFormat": "evm-byzantium-bytecode",
-                        "sourceList": [
-                            "0xc4fb652765fbc8c62ef9e87524c33e75cec4800f5f926c9b92bb65a8f344516c",
-                            "0x450f10bb4c2c7c13bba9bee136d5dcffc96afdef00d12b3b9398f7c32a7571c6"
-                        ]
-                    },
-                    {
-                        "sourceMap": "812:50:0",
-                        "sourceType": "solidity-file",
-                        "sourceFormat": "text",
-                        "sourceList": [
-                            "/home/spoons/diligence/mythx-qa/land/contracts/estate/EstateStorage.sol"
-                        ]
-                    }
-                ],
-                "extra": {
-                    "discoveryTime": 5723484754,
-                    "testCases": [
-                        {
-                            "initialState": {
-                                "accounts": {
-                                    "0x901d12ebe1b195e5aa8748e62bd7734ae19b51f": {
-                                        "balance": "0x0",
-                                        "code": "6080604052600436106100775763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166307ecec3e811461007c5780630a354fce146100c45780633970bfd3146100ee5780637b103999146101095780639d40b850146101475780639f813b1b1461015f575b600080fd5b34801561008857600080fd5b506100b073ffffffffffffffffffffffffffffffffffffffff6004358116906024351661017a565b604080519115158252519081900360200190f35b3480156100d057600080fd5b506100dc60043561019a565b60408051918252519081900360200190f35b3480156100fa57600080fd5b506100dc6004356024356101ac565b34801561011557600080fd5b5061011e6101dc565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b34801561015357600080fd5b5061011e6004356101f8565b34801561016b57600080fd5b506100dc600435602435610220565b600660209081526000928352604080842090915290825290205460ff1681565b60026020526000908152604090205481565b6001602052816000526040600020818154811015156101c757fe5b90600052602060002001600091509150505481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60056020526000908152604090205473ffffffffffffffffffffffffffffffffffffffff1681565b6003602090815260009283526040808420909152908252902054815600a165627a7a72305820f64a07ca79d7ea541c6da153a5e58913679321b2cc8435fdddbd0735083dba550029",
-                                        "nonce": 0,
-                                        "storage": {}
-                                    },
-                                    "0xaffeaffeaffeaffeaffeaffeaffeaffeaffeaffe": {
-                                        "balance": "0x1",
-                                        "code": "",
-                                        "nonce": 0,
-                                        "storage": {}
-                                    },
-                                    "0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef": {
-                                        "balance": "0x0",
-                                        "code": "",
-                                        "nonce": 0,
-                                        "storage": {}
-                                    }
-                                }
-                            },
-                            "steps": [
-                                {
-                                    "address": "",
-                                    "blockCoinbase": "0xcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcb",
-                                    "blockDifficulty": "0xa7d7343662e26",
-                                    "blockGasLimit": "0x7d0000",
-                                    "blockNumber": "0x66e393",
-                                    "blockTime": "0x5bfa4639",
-                                    "gasLimit": "0x7d000",
-                                    "gasPrice": "0x773594000",
-                                    "input": "0x608060405234801561001057600080fd5b50610269806100206000396000f3006080604052600436106100775763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166307ecec3e811461007c5780630a354fce146100c45780633970bfd3146100ee5780637b103999146101095780639d40b850146101475780639f813b1b1461015f575b600080fd5b34801561008857600080fd5b506100b073ffffffffffffffffffffffffffffffffffffffff6004358116906024351661017a565b604080519115158252519081900360200190f35b3480156100d057600080fd5b506100dc60043561019a565b60408051918252519081900360200190f35b3480156100fa57600080fd5b506100dc6004356024356101ac565b34801561011557600080fd5b5061011e6101dc565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b34801561015357600080fd5b5061011e6004356101f8565b34801561016b57600080fd5b506100dc600435602435610220565b600660209081526000928352604080842090915290825290205460ff1681565b60026020526000908152604090205481565b6001602052816000526040600020818154811015156101c757fe5b90600052602060002001600091509150505481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60056020526000908152604090205473ffffffffffffffffffffffffffffffffffffffff1681565b6003602090815260009283526040808420909152908252902054815600a165627a7a72305820f64a07ca79d7ea541c6da153a5e58913679321b2cc8435fdddbd0735083dba550029",
-                                    "name": "unknown",
-                                    "origin": "0xaffeaffeaffeaffeaffeaffeaffeaffeaffeaffe",
-                                    "value": "0x0"
-                                },
-                                {
-                                    "address": "0x901d12ebe1b195e5aa8748e62bd7734ae19b51f",
-                                    "blockCoinbase": "0xcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcbcb",
-                                    "blockDifficulty": "0xa7d7343662e26",
-                                    "blockGasLimit": "0x7d0000",
-                                    "blockNumber": "0x66e393",
-                                    "blockTime": "0x5bfa4639",
-                                    "gasLimit": "0x7d000",
-                                    "gasPrice": "0x773594000",
-                                    "input": "0x3970bfd3",
-                                    "name": "unknown",
-                                    "origin": "0xaffeaffeaffeaffeaffeaffeaffeaffeaffeaffe",
-                                    "value": "0x0"
-                                }
-                            ]
-                        },
-                        {
-                            "initialState": {
-                                "accounts": {
-                                    "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0": {
-                                        "nonce": 0,
-                                        "balance": "0x00000000000000000000000000000000000000ffffffffffffffffffffffffff",
-                                        "code": "",
-                                        "storage": {}
-                                    },
-                                    "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1": {
-                                        "nonce": 1,
-                                        "balance": "0x0000000000000000000000000000000000000000000000000000000000000000",
-                                        "code": "",
-                                        "storage": {}
-                                    },
-                                    "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa2": {
-                                        "nonce": 1,
-                                        "balance": "0x00000000000000000000000000000000000000ffffffffffffffffffffffffff",
-                                        "code": "",
-                                        "storage": {}
-                                    },
-                                    "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa3": {
-                                        "nonce": 1,
-                                        "balance": "0x00000000000000000000000000000000000000ffffffffffffffffffffffffff",
-                                        "code": "0x00",
-                                        "storage": {}
-                                    },
-                                    "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa4": {
-                                        "nonce": 1,
-                                        "balance": "0x00000000000000000000000000000000000000ffffffffffffffffffffffffff",
-                                        "code": "0xfd",
-                                        "storage": {}
-                                    },
-                                    "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa5": {
-                                        "nonce": 1,
-                                        "balance": "0x00000000000000000000000000000000000000ffffffffffffffffffffffffff",
-                                        "code": "0x608060405260005600a165627a7a72305820466f8a1bdae15c60b8e998fe04836ef505803cfbd8edd29bd4679531357576530029",
-                                        "storage": {}
-                                    },
-                                    "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa6": {
-                                        "nonce": 1,
-                                        "balance": "0x00000000000000000000000000000000000000ffffffffffffffffffffffffff",
-                                        "code": "0x608060405273aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa63081146038578073ffffffffffffffffffffffffffffffffffffffff16ff5b5000fea165627a7a723058205e8b906b72ad42c69b05acf4542283b6080ae82562bc74baac467daac2fb0e0e0029",
-                                        "storage": {}
-                                    },
-                                    "0xaffeaffeaffeaffeaffeaffeaffeaffeaffeaffe": {
-                                        "nonce": 0,
-                                        "balance": "0x0000000000000000000000000000000000ffffffffffffffffffffffffffffff",
-                                        "code": "",
-                                        "storage": {}
-                                    }
-                                }
-                            },
-                            "steps": [
-                                {
-                                    "address": "",
-                                    "gasLimit": "0xffffff",
-                                    "gasPrice": "0x773594000",
-                                    "input": "0x608060405234801561001057600080fd5b50610269806100206000396000f3006080604052600436106100775763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166307ecec3e811461007c5780630a354fce146100c45780633970bfd3146100ee5780637b103999146101095780639d40b850146101475780639f813b1b1461015f575b600080fd5b34801561008857600080fd5b506100b073ffffffffffffffffffffffffffffffffffffffff6004358116906024351661017a565b604080519115158252519081900360200190f35b3480156100d057600080fd5b506100dc60043561019a565b60408051918252519081900360200190f35b3480156100fa57600080fd5b506100dc6004356024356101ac565b34801561011557600080fd5b5061011e6101dc565b6040805173ffffffffffffffffffffffffffffffffffffffff9092168252519081900360200190f35b34801561015357600080fd5b5061011e6004356101f8565b34801561016b57600080fd5b506100dc600435602435610220565b600660209081526000928352604080842090915290825290205460ff1681565b60026020526000908152604090205481565b6001602052816000526040600020818154811015156101c757fe5b90600052602060002001600091509150505481565b60005473ffffffffffffffffffffffffffffffffffffffff1681565b60056020526000908152604090205473ffffffffffffffffffffffffffffffffffffffff1681565b6003602090815260009283526040808420909152908252902054815600a165627a7a72305820f64a07ca79d7ea541c6da153a5e58913679321b2cc8435fdddbd0735083dba550029",
-                                    "origin": "0xaffeaffeaffeaffeaffeaffeaffeaffeaffeaffe",
-                                    "value": "0x0",
-                                    "blockCoinbase": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0",
-                                    "blockDifficulty": "0xa7d7343662e26",
-                                    "blockGasLimit": "0xffffff",
-                                    "blockNumber": "0x661a55",
-                                    "blockTime": "0x5be99aa8"
-                                },
-                                {
-                                    "address": "0x0901d12ebe1b195e5aa8748e62bd7734ae19b51f",
-                                    "gasLimit": "0x7d000",
-                                    "gasPrice": "0x773594000",
-                                    "input": "0x3970bfd30000000000000000000000000000000000000011000000000000000000000000000000000000000000000000000000000000000000000000",
-                                    "origin": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0",
-                                    "value": "0x0",
-                                    "blockCoinbase": "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0",
-                                    "blockDifficulty": "0xa7d7343662e26",
-                                    "blockGasLimit": "0x7d0000",
-                                    "blockNumber": "0x68621c",
-                                    "blockTime": "0x5be99aa8"
-                                }
-                            ]
-                        }
-                    ],
-                    "toolName": "mythril"
-                }
-            },
-            {
-                "swcID": "",
-                "swcTitle": "",
-                "description": {
-                    "head": "Upgrade to MythX Pro to unlock the ability to test for even more vulnerabilities, perform deeper security analysis, and more. https://mythx.io/plans",
-                    "tail": "Warning: Free mode only detects certain types of smart contract vulnerabilities. Your contract may still be unsafe. Upgrade to MythX Pro to unlock the ability to test for even more vulnerabilities, perform deeper security analysis, and more. https://mythx.io/plans"
-                },
-                "severity": "Low",
-                "locations": [],
-                "extra": {}
-            }
-        ],
-        "sourceType": "solidity-file",
-        "sourceFormat": "text",
-        "sourceList": [
-            "/home/spoons/diligence/mythx-qa/land/contracts/estate/EstateStorage.sol"
-        ],
-        "meta": {
-            "selectedCompiler": "Unknown",
-            "coveredPaths": 14,
-            "coveredInstructions": 315
-        }
-    }
-]
diff --git a/tests/testdata/detected-issues-simple.txt b/tests/testdata/detected-issues-simple.txt
deleted file mode 100644
index e9c1960..0000000
--- a/tests/testdata/detected-issues-simple.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Report for /home/spoons/diligence/mythx-qa/land/contracts/estate/EstateStorage.sol
-Title: Assert Violation (Low)
-Description: A reachable exception has been detected.
-Line: 24
-	mapping(uint256 => uint256[]) public estateLandIds;
-
diff --git a/tests/testdata/detected-issues-table.txt b/tests/testdata/detected-issues-table.txt
deleted file mode 100644
index a9fe854..0000000
--- a/tests/testdata/detected-issues-table.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Report for /home/spoons/diligence/mythx-qa/land/contracts/estate/EstateStorage.sol
-https://dashboard.mythx.io/#/console/analyses/ab9092f7-54d0-480f-9b63-1bb1508280e2
-╒════════╤════════════════════════════╤════════════╤══════════════════════════════════════════╕
-│   Line │ SWC Title                  │ Severity   │ Short Description                        │
-╞════════╪════════════════════════════╪════════════╪══════════════════════════════════════════╡
-│     24 │ (SWC-110) Assert Violation │ Low        │ A reachable exception has been detected. │
-╘════════╧════════════════════════════╧════════════╧══════════════════════════════════════════╛
-
diff --git a/tests/testdata/faas-new-campaign-request.json b/tests/testdata/faas-new-campaign-request.json
deleted file mode 100644
index ae41ace..0000000
--- a/tests/testdata/faas-new-campaign-request.json
+++ /dev/null
@@ -1,2924 +0,0 @@
-{
-    "parameters": {
-        "discovery-probability-threshold": 0.0,
-        "num-cores": 1,
-        "assertion-checking-mode": 1
-    },
-    "name": "brownie_test_yqzeu",
-    "corpus": {
-        "address-under-test": "0x7277646075fa72737e1F6114654C5d9949a67dF2",
-        "steps": [
-            {
-                "hash": "0x5b2213faa860f042be3d68c782ee5a1f45aea9505f874a1370a0c3163e13f3f8",
-                "nonce": "0x0",
-                "blockHash": "0x12effde2c3cb82e381e7e4232d3bf810920df83710faf07940a1c510a96d1740",
-                "blockNumber": "0x1",
-                "transactionIndex": "0x0",
-                "from": "0xe6559ce865436c9206c6a971ed34658a57e51f17",
-                "to": "",
-                "value": "0x0",
-                "gas": "0x6691b7",
-                "gasPrice": "0x0",
-                "input": "0x608060405234801561001057600080fd5b506101c8806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063b0a378b01461003b578063df5b722714610055575b600080fd5b610043610076565b60408051918252519081900360200190f35b6100746004803603602081101561006b57600080fd5b503515156100e7565b005b6000610080610109565b90506000546013146100e457604080516020808252601390820152720c0e88151a1a5cc81cda1bdd5b190819985a5b606a1b8183015290517fb42604cb105a16c8f6db8a41e6b00c0c1b4826465e8bc504b3eb3e88b3e6a4a09181900360600190a1fe5b90565b806100f35760006100f6565b60015b60ff166000546002020160008190555050565b60008054600a141561011757fe5b600054601e141561012457fe5b6000546032141561013157fe5b6000546046141561013e57fe5b600054605a141561014b57fe5b600054606e141561015857fe5b6000546082141561016557fe5b6000546096141561017257fe5b60005460aa141561017f57fe5b60005460be141561018c57fe5b5060009056fea2646970667358221220d15c0974595ed5c9a5da68377d16635bfa92f13a2af22bf0b52f63632505f04664736f6c634300060c0033",
-                "v": "0x25",
-                "r": "0x8cb33aaf88705ef9b626e3b641c356c50c478912fb02ccddef9ab053fc83827b",
-                "s": "0x62e58b06e7c1decaedbdb8bfcdbddf69c56c5bfce6f27187ac587492686efd77"
-            }
-        ],
-        "other-addresses-under-test": []
-    },
-    "sources": {
-        "contracts/sample.sol": {
-            "fileIndex": "0",
-            "source": "pragma solidity <0.8.0;\n\ncontract Foo {\n    event AssertionFailed(string message);\n\n    int256 private x;\n\n    function Bar() public returns (int256 RET_0) {\n        RET_0 = _original_Foo_Bar();\n        if (!(x == 19)) {\n            emit AssertionFailed(\"0: This should fail\");\n            assert(false);\n        }\n    }\n\n    function _original_Foo_Bar() private view returns (int256) {\n        if (x == 10) {\n            assert(false);\n            return 1;\n        }\n        if (x == 30) {\n            assert(false);\n            return 3;\n        }\n        if (x == 50) {\n            assert(false);\n            return 5;\n        }\n        if (x == 70) {\n            assert(false);\n            return 7;\n        }\n        if (x == 90) {\n            assert(false);\n            return 9;\n        }\n        if (x == 110) {\n            assert(false);\n            return 11;\n        }\n        if (x == 130) {\n            assert(false);\n            return 13;\n        }\n        if (x == 150) {\n            assert(false);\n            return 15;\n        }\n        if (x == 170) {\n            assert(false);\n            return 17;\n        }\n        if (x == 190) {\n            assert(false);\n            return 19;\n        }\n        return 0;\n    }\n\n    function SetNext(bool b) public {\n        x = (2 * x) + (b ? 1 : 0);\n    }\n}",
-            "ast": {
-                "absolutePath": "contracts/sample.sol",
-                "exportedSymbols": {
-                    "Foo": [
-                        171
-                    ]
-                },
-                "id": 172,
-                "license": null,
-                "nodeType": "SourceUnit",
-                "nodes": [
-                    {
-                        "id": 1,
-                        "literals": [
-                            "solidity",
-                            "<",
-                            "0.8",
-                            ".0"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "0:23:0"
-                    },
-                    {
-                        "abstract": false,
-                        "baseContracts": [],
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "documentation": null,
-                        "fullyImplemented": true,
-                        "id": 171,
-                        "linearizedBaseContracts": [
-                            171
-                        ],
-                        "name": "Foo",
-                        "nodeType": "ContractDefinition",
-                        "nodes": [
-                            {
-                                "anonymous": false,
-                                "documentation": null,
-                                "id": 5,
-                                "name": "AssertionFailed",
-                                "nodeType": "EventDefinition",
-                                "parameters": {
-                                    "id": 4,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 3,
-                                            "indexed": false,
-                                            "mutability": "mutable",
-                                            "name": "message",
-                                            "nodeType": "VariableDeclaration",
-                                            "overrides": null,
-                                            "scope": 5,
-                                            "src": "66:14:0",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_string_memory_ptr",
-                                                "typeString": "string"
-                                            },
-                                            "typeName": {
-                                                "id": 2,
-                                                "name": "string",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "66:6:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_string_storage_ptr",
-                                                    "typeString": "string"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "65:16:0"
-                                },
-                                "src": "44:38:0"
-                            },
-                            {
-                                "constant": false,
-                                "id": 7,
-                                "mutability": "mutable",
-                                "name": "x",
-                                "nodeType": "VariableDeclaration",
-                                "overrides": null,
-                                "scope": 171,
-                                "src": "88:16:0",
-                                "stateVariable": true,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_int256",
-                                    "typeString": "int256"
-                                },
-                                "typeName": {
-                                    "id": 6,
-                                    "name": "int256",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "88:6:0",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_int256",
-                                        "typeString": "int256"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "private"
-                            },
-                            {
-                                "body": {
-                                    "id": 32,
-                                    "nodeType": "Block",
-                                    "src": "156:164:0",
-                                    "statements": [
-                                        {
-                                            "expression": {
-                                                "argumentTypes": null,
-                                                "id": 15,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftHandSide": {
-                                                    "argumentTypes": null,
-                                                    "id": 12,
-                                                    "name": "RET_0",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 10,
-                                                    "src": "166:5:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "Assignment",
-                                                "operator": "=",
-                                                "rightHandSide": {
-                                                    "argumentTypes": null,
-                                                    "arguments": [],
-                                                    "expression": {
-                                                        "argumentTypes": [],
-                                                        "id": 13,
-                                                        "name": "_original_Foo_Bar",
-                                                        "nodeType": "Identifier",
-                                                        "overloadedDeclarations": [],
-                                                        "referencedDeclaration": 151,
-                                                        "src": "174:17:0",
-                                                        "typeDescriptions": {
-                                                            "typeIdentifier": "t_function_internal_view$__$returns$_t_int256_$",
-                                                            "typeString": "function () view returns (int256)"
-                                                        }
-                                                    },
-                                                    "id": 14,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": false,
-                                                    "kind": "functionCall",
-                                                    "lValueRequested": false,
-                                                    "names": [],
-                                                    "nodeType": "FunctionCall",
-                                                    "src": "174:19:0",
-                                                    "tryCall": false,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "src": "166:27:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "id": 16,
-                                            "nodeType": "ExpressionStatement",
-                                            "src": "166:27:0"
-                                        },
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "id": 21,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "nodeType": "UnaryOperation",
-                                                "operator": "!",
-                                                "prefix": true,
-                                                "src": "207:10:0",
-                                                "subExpression": {
-                                                    "argumentTypes": null,
-                                                    "components": [
-                                                        {
-                                                            "argumentTypes": null,
-                                                            "commonType": {
-                                                                "typeIdentifier": "t_int256",
-                                                                "typeString": "int256"
-                                                            },
-                                                            "id": 19,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "lValueRequested": false,
-                                                            "leftExpression": {
-                                                                "argumentTypes": null,
-                                                                "id": 17,
-                                                                "name": "x",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": 7,
-                                                                "src": "209:1:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_int256",
-                                                                    "typeString": "int256"
-                                                                }
-                                                            },
-                                                            "nodeType": "BinaryOperation",
-                                                            "operator": "==",
-                                                            "rightExpression": {
-                                                                "argumentTypes": null,
-                                                                "hexValue": "3139",
-                                                                "id": 18,
-                                                                "isConstant": false,
-                                                                "isLValue": false,
-                                                                "isPure": true,
-                                                                "kind": "number",
-                                                                "lValueRequested": false,
-                                                                "nodeType": "Literal",
-                                                                "src": "214:2:0",
-                                                                "subdenomination": null,
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_rational_19_by_1",
-                                                                    "typeString": "int_const 19"
-                                                                },
-                                                                "value": "19"
-                                                            },
-                                                            "src": "209:7:0",
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_bool",
-                                                                "typeString": "bool"
-                                                            }
-                                                        }
-                                                    ],
-                                                    "id": 20,
-                                                    "isConstant": false,
-                                                    "isInlineArray": false,
-                                                    "isLValue": false,
-                                                    "isPure": false,
-                                                    "lValueRequested": false,
-                                                    "nodeType": "TupleExpression",
-                                                    "src": "208:9:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_bool",
-                                                        "typeString": "bool"
-                                                    }
-                                                },
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 31,
-                                            "nodeType": "IfStatement",
-                                            "src": "203:111:0",
-                                            "trueBody": {
-                                                "id": 30,
-                                                "nodeType": "Block",
-                                                "src": "219:95:0",
-                                                "statements": [
-                                                    {
-                                                        "eventCall": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "303a20546869732073686f756c64206661696c",
-                                                                    "id": 23,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "string",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "254:21:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_stringliteral_7379ea5b6329927764dc2a90425e24f5f69809aa582db010111d15cc830e8a08",
-                                                                        "typeString": "literal_string \"0: This should fail\""
-                                                                    },
-                                                                    "value": "0: This should fail"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_stringliteral_7379ea5b6329927764dc2a90425e24f5f69809aa582db010111d15cc830e8a08",
-                                                                        "typeString": "literal_string \"0: This should fail\""
-                                                                    }
-                                                                ],
-                                                                "id": 22,
-                                                                "name": "AssertionFailed",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": 5,
-                                                                "src": "238:15:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_event_nonpayable$_t_string_memory_ptr_$returns$__$",
-                                                                    "typeString": "function (string memory)"
-                                                                }
-                                                            },
-                                                            "id": 24,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "238:38:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 25,
-                                                        "nodeType": "EmitStatement",
-                                                        "src": "233:43:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 27,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "297:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 26,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "290:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 28,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "290:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 29,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "290:13:0"
-                                                    }
-                                                ]
-                                            }
-                                        }
-                                    ]
-                                },
-                                "documentation": null,
-                                "functionSelector": "b0a378b0",
-                                "id": 33,
-                                "implemented": true,
-                                "kind": "function",
-                                "modifiers": [],
-                                "name": "Bar",
-                                "nodeType": "FunctionDefinition",
-                                "overrides": null,
-                                "parameters": {
-                                    "id": 8,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "123:2:0"
-                                },
-                                "returnParameters": {
-                                    "id": 11,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 10,
-                                            "mutability": "mutable",
-                                            "name": "RET_0",
-                                            "nodeType": "VariableDeclaration",
-                                            "overrides": null,
-                                            "scope": 33,
-                                            "src": "142:12:0",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_int256",
-                                                "typeString": "int256"
-                                            },
-                                            "typeName": {
-                                                "id": 9,
-                                                "name": "int256",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "142:6:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "141:14:0"
-                                },
-                                "scope": 171,
-                                "src": "111:209:0",
-                                "stateMutability": "nonpayable",
-                                "virtual": false,
-                                "visibility": "public"
-                            },
-                            {
-                                "body": {
-                                    "id": 150,
-                                    "nodeType": "Block",
-                                    "src": "385:855:0",
-                                    "statements": [
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "commonType": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                },
-                                                "id": 40,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftExpression": {
-                                                    "argumentTypes": null,
-                                                    "id": 38,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "399:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "BinaryOperation",
-                                                "operator": "==",
-                                                "rightExpression": {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "3130",
-                                                    "id": 39,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "404:2:0",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_rational_10_by_1",
-                                                        "typeString": "int_const 10"
-                                                    },
-                                                    "value": "10"
-                                                },
-                                                "src": "399:7:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 48,
-                                            "nodeType": "IfStatement",
-                                            "src": "395:73:0",
-                                            "trueBody": {
-                                                "id": 47,
-                                                "nodeType": "Block",
-                                                "src": "408:60:0",
-                                                "statements": [
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 42,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "429:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 41,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "422:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 43,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "422:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 44,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "422:13:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "hexValue": "31",
-                                                            "id": 45,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": true,
-                                                            "kind": "number",
-                                                            "lValueRequested": false,
-                                                            "nodeType": "Literal",
-                                                            "src": "456:1:0",
-                                                            "subdenomination": null,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_rational_1_by_1",
-                                                                "typeString": "int_const 1"
-                                                            },
-                                                            "value": "1"
-                                                        },
-                                                        "functionReturnParameters": 37,
-                                                        "id": 46,
-                                                        "nodeType": "Return",
-                                                        "src": "449:8:0"
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "commonType": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                },
-                                                "id": 51,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftExpression": {
-                                                    "argumentTypes": null,
-                                                    "id": 49,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "481:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "BinaryOperation",
-                                                "operator": "==",
-                                                "rightExpression": {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "3330",
-                                                    "id": 50,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "486:2:0",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_rational_30_by_1",
-                                                        "typeString": "int_const 30"
-                                                    },
-                                                    "value": "30"
-                                                },
-                                                "src": "481:7:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 59,
-                                            "nodeType": "IfStatement",
-                                            "src": "477:73:0",
-                                            "trueBody": {
-                                                "id": 58,
-                                                "nodeType": "Block",
-                                                "src": "490:60:0",
-                                                "statements": [
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 53,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "511:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 52,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "504:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 54,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "504:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 55,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "504:13:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "hexValue": "33",
-                                                            "id": 56,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": true,
-                                                            "kind": "number",
-                                                            "lValueRequested": false,
-                                                            "nodeType": "Literal",
-                                                            "src": "538:1:0",
-                                                            "subdenomination": null,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_rational_3_by_1",
-                                                                "typeString": "int_const 3"
-                                                            },
-                                                            "value": "3"
-                                                        },
-                                                        "functionReturnParameters": 37,
-                                                        "id": 57,
-                                                        "nodeType": "Return",
-                                                        "src": "531:8:0"
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "commonType": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                },
-                                                "id": 62,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftExpression": {
-                                                    "argumentTypes": null,
-                                                    "id": 60,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "563:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "BinaryOperation",
-                                                "operator": "==",
-                                                "rightExpression": {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "3530",
-                                                    "id": 61,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "568:2:0",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_rational_50_by_1",
-                                                        "typeString": "int_const 50"
-                                                    },
-                                                    "value": "50"
-                                                },
-                                                "src": "563:7:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 70,
-                                            "nodeType": "IfStatement",
-                                            "src": "559:73:0",
-                                            "trueBody": {
-                                                "id": 69,
-                                                "nodeType": "Block",
-                                                "src": "572:60:0",
-                                                "statements": [
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 64,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "593:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 63,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "586:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 65,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "586:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 66,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "586:13:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "hexValue": "35",
-                                                            "id": 67,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": true,
-                                                            "kind": "number",
-                                                            "lValueRequested": false,
-                                                            "nodeType": "Literal",
-                                                            "src": "620:1:0",
-                                                            "subdenomination": null,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_rational_5_by_1",
-                                                                "typeString": "int_const 5"
-                                                            },
-                                                            "value": "5"
-                                                        },
-                                                        "functionReturnParameters": 37,
-                                                        "id": 68,
-                                                        "nodeType": "Return",
-                                                        "src": "613:8:0"
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "commonType": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                },
-                                                "id": 73,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftExpression": {
-                                                    "argumentTypes": null,
-                                                    "id": 71,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "645:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "BinaryOperation",
-                                                "operator": "==",
-                                                "rightExpression": {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "3730",
-                                                    "id": 72,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "650:2:0",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_rational_70_by_1",
-                                                        "typeString": "int_const 70"
-                                                    },
-                                                    "value": "70"
-                                                },
-                                                "src": "645:7:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 81,
-                                            "nodeType": "IfStatement",
-                                            "src": "641:73:0",
-                                            "trueBody": {
-                                                "id": 80,
-                                                "nodeType": "Block",
-                                                "src": "654:60:0",
-                                                "statements": [
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 75,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "675:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 74,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "668:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 76,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "668:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 77,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "668:13:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "hexValue": "37",
-                                                            "id": 78,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": true,
-                                                            "kind": "number",
-                                                            "lValueRequested": false,
-                                                            "nodeType": "Literal",
-                                                            "src": "702:1:0",
-                                                            "subdenomination": null,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_rational_7_by_1",
-                                                                "typeString": "int_const 7"
-                                                            },
-                                                            "value": "7"
-                                                        },
-                                                        "functionReturnParameters": 37,
-                                                        "id": 79,
-                                                        "nodeType": "Return",
-                                                        "src": "695:8:0"
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "commonType": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                },
-                                                "id": 84,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftExpression": {
-                                                    "argumentTypes": null,
-                                                    "id": 82,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "727:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "BinaryOperation",
-                                                "operator": "==",
-                                                "rightExpression": {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "3930",
-                                                    "id": 83,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "732:2:0",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_rational_90_by_1",
-                                                        "typeString": "int_const 90"
-                                                    },
-                                                    "value": "90"
-                                                },
-                                                "src": "727:7:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 92,
-                                            "nodeType": "IfStatement",
-                                            "src": "723:73:0",
-                                            "trueBody": {
-                                                "id": 91,
-                                                "nodeType": "Block",
-                                                "src": "736:60:0",
-                                                "statements": [
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 86,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "757:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 85,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "750:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 87,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "750:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 88,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "750:13:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "hexValue": "39",
-                                                            "id": 89,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": true,
-                                                            "kind": "number",
-                                                            "lValueRequested": false,
-                                                            "nodeType": "Literal",
-                                                            "src": "784:1:0",
-                                                            "subdenomination": null,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_rational_9_by_1",
-                                                                "typeString": "int_const 9"
-                                                            },
-                                                            "value": "9"
-                                                        },
-                                                        "functionReturnParameters": 37,
-                                                        "id": 90,
-                                                        "nodeType": "Return",
-                                                        "src": "777:8:0"
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "commonType": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                },
-                                                "id": 95,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftExpression": {
-                                                    "argumentTypes": null,
-                                                    "id": 93,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "809:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "BinaryOperation",
-                                                "operator": "==",
-                                                "rightExpression": {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "313130",
-                                                    "id": 94,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "814:3:0",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_rational_110_by_1",
-                                                        "typeString": "int_const 110"
-                                                    },
-                                                    "value": "110"
-                                                },
-                                                "src": "809:8:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 103,
-                                            "nodeType": "IfStatement",
-                                            "src": "805:75:0",
-                                            "trueBody": {
-                                                "id": 102,
-                                                "nodeType": "Block",
-                                                "src": "819:61:0",
-                                                "statements": [
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 97,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "840:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 96,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "833:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 98,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "833:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 99,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "833:13:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "hexValue": "3131",
-                                                            "id": 100,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": true,
-                                                            "kind": "number",
-                                                            "lValueRequested": false,
-                                                            "nodeType": "Literal",
-                                                            "src": "867:2:0",
-                                                            "subdenomination": null,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_rational_11_by_1",
-                                                                "typeString": "int_const 11"
-                                                            },
-                                                            "value": "11"
-                                                        },
-                                                        "functionReturnParameters": 37,
-                                                        "id": 101,
-                                                        "nodeType": "Return",
-                                                        "src": "860:9:0"
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "commonType": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                },
-                                                "id": 106,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftExpression": {
-                                                    "argumentTypes": null,
-                                                    "id": 104,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "893:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "BinaryOperation",
-                                                "operator": "==",
-                                                "rightExpression": {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "313330",
-                                                    "id": 105,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "898:3:0",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_rational_130_by_1",
-                                                        "typeString": "int_const 130"
-                                                    },
-                                                    "value": "130"
-                                                },
-                                                "src": "893:8:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 114,
-                                            "nodeType": "IfStatement",
-                                            "src": "889:75:0",
-                                            "trueBody": {
-                                                "id": 113,
-                                                "nodeType": "Block",
-                                                "src": "903:61:0",
-                                                "statements": [
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 108,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "924:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 107,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "917:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 109,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "917:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 110,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "917:13:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "hexValue": "3133",
-                                                            "id": 111,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": true,
-                                                            "kind": "number",
-                                                            "lValueRequested": false,
-                                                            "nodeType": "Literal",
-                                                            "src": "951:2:0",
-                                                            "subdenomination": null,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_rational_13_by_1",
-                                                                "typeString": "int_const 13"
-                                                            },
-                                                            "value": "13"
-                                                        },
-                                                        "functionReturnParameters": 37,
-                                                        "id": 112,
-                                                        "nodeType": "Return",
-                                                        "src": "944:9:0"
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "commonType": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                },
-                                                "id": 117,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftExpression": {
-                                                    "argumentTypes": null,
-                                                    "id": 115,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "977:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "BinaryOperation",
-                                                "operator": "==",
-                                                "rightExpression": {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "313530",
-                                                    "id": 116,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "982:3:0",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_rational_150_by_1",
-                                                        "typeString": "int_const 150"
-                                                    },
-                                                    "value": "150"
-                                                },
-                                                "src": "977:8:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 125,
-                                            "nodeType": "IfStatement",
-                                            "src": "973:75:0",
-                                            "trueBody": {
-                                                "id": 124,
-                                                "nodeType": "Block",
-                                                "src": "987:61:0",
-                                                "statements": [
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 119,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "1008:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 118,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "1001:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 120,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "1001:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 121,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "1001:13:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "hexValue": "3135",
-                                                            "id": 122,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": true,
-                                                            "kind": "number",
-                                                            "lValueRequested": false,
-                                                            "nodeType": "Literal",
-                                                            "src": "1035:2:0",
-                                                            "subdenomination": null,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_rational_15_by_1",
-                                                                "typeString": "int_const 15"
-                                                            },
-                                                            "value": "15"
-                                                        },
-                                                        "functionReturnParameters": 37,
-                                                        "id": 123,
-                                                        "nodeType": "Return",
-                                                        "src": "1028:9:0"
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "commonType": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                },
-                                                "id": 128,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftExpression": {
-                                                    "argumentTypes": null,
-                                                    "id": 126,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "1061:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "BinaryOperation",
-                                                "operator": "==",
-                                                "rightExpression": {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "313730",
-                                                    "id": 127,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "1066:3:0",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_rational_170_by_1",
-                                                        "typeString": "int_const 170"
-                                                    },
-                                                    "value": "170"
-                                                },
-                                                "src": "1061:8:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 136,
-                                            "nodeType": "IfStatement",
-                                            "src": "1057:75:0",
-                                            "trueBody": {
-                                                "id": 135,
-                                                "nodeType": "Block",
-                                                "src": "1071:61:0",
-                                                "statements": [
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 130,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "1092:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 129,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "1085:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 131,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "1085:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 132,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "1085:13:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "hexValue": "3137",
-                                                            "id": 133,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": true,
-                                                            "kind": "number",
-                                                            "lValueRequested": false,
-                                                            "nodeType": "Literal",
-                                                            "src": "1119:2:0",
-                                                            "subdenomination": null,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_rational_17_by_1",
-                                                                "typeString": "int_const 17"
-                                                            },
-                                                            "value": "17"
-                                                        },
-                                                        "functionReturnParameters": 37,
-                                                        "id": 134,
-                                                        "nodeType": "Return",
-                                                        "src": "1112:9:0"
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "condition": {
-                                                "argumentTypes": null,
-                                                "commonType": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                },
-                                                "id": 139,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftExpression": {
-                                                    "argumentTypes": null,
-                                                    "id": 137,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "1145:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "BinaryOperation",
-                                                "operator": "==",
-                                                "rightExpression": {
-                                                    "argumentTypes": null,
-                                                    "hexValue": "313930",
-                                                    "id": 138,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": true,
-                                                    "kind": "number",
-                                                    "lValueRequested": false,
-                                                    "nodeType": "Literal",
-                                                    "src": "1150:3:0",
-                                                    "subdenomination": null,
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_rational_190_by_1",
-                                                        "typeString": "int_const 190"
-                                                    },
-                                                    "value": "190"
-                                                },
-                                                "src": "1145:8:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "falseBody": null,
-                                            "id": 147,
-                                            "nodeType": "IfStatement",
-                                            "src": "1141:75:0",
-                                            "trueBody": {
-                                                "id": 146,
-                                                "nodeType": "Block",
-                                                "src": "1155:61:0",
-                                                "statements": [
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "arguments": [
-                                                                {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "66616c7365",
-                                                                    "id": 141,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "bool",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "1176:5:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    },
-                                                                    "value": "false"
-                                                                }
-                                                            ],
-                                                            "expression": {
-                                                                "argumentTypes": [
-                                                                    {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                ],
-                                                                "id": 140,
-                                                                "name": "assert",
-                                                                "nodeType": "Identifier",
-                                                                "overloadedDeclarations": [],
-                                                                "referencedDeclaration": -3,
-                                                                "src": "1169:6:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_function_assert_pure$_t_bool_$returns$__$",
-                                                                    "typeString": "function (bool) pure"
-                                                                }
-                                                            },
-                                                            "id": 142,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": false,
-                                                            "kind": "functionCall",
-                                                            "lValueRequested": false,
-                                                            "names": [],
-                                                            "nodeType": "FunctionCall",
-                                                            "src": "1169:13:0",
-                                                            "tryCall": false,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_tuple$__$",
-                                                                "typeString": "tuple()"
-                                                            }
-                                                        },
-                                                        "id": 143,
-                                                        "nodeType": "ExpressionStatement",
-                                                        "src": "1169:13:0"
-                                                    },
-                                                    {
-                                                        "expression": {
-                                                            "argumentTypes": null,
-                                                            "hexValue": "3139",
-                                                            "id": 144,
-                                                            "isConstant": false,
-                                                            "isLValue": false,
-                                                            "isPure": true,
-                                                            "kind": "number",
-                                                            "lValueRequested": false,
-                                                            "nodeType": "Literal",
-                                                            "src": "1203:2:0",
-                                                            "subdenomination": null,
-                                                            "typeDescriptions": {
-                                                                "typeIdentifier": "t_rational_19_by_1",
-                                                                "typeString": "int_const 19"
-                                                            },
-                                                            "value": "19"
-                                                        },
-                                                        "functionReturnParameters": 37,
-                                                        "id": 145,
-                                                        "nodeType": "Return",
-                                                        "src": "1196:9:0"
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "expression": {
-                                                "argumentTypes": null,
-                                                "hexValue": "30",
-                                                "id": 148,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": true,
-                                                "kind": "number",
-                                                "lValueRequested": false,
-                                                "nodeType": "Literal",
-                                                "src": "1232:1:0",
-                                                "subdenomination": null,
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_rational_0_by_1",
-                                                    "typeString": "int_const 0"
-                                                },
-                                                "value": "0"
-                                            },
-                                            "functionReturnParameters": 37,
-                                            "id": 149,
-                                            "nodeType": "Return",
-                                            "src": "1225:8:0"
-                                        }
-                                    ]
-                                },
-                                "documentation": null,
-                                "id": 151,
-                                "implemented": true,
-                                "kind": "function",
-                                "modifiers": [],
-                                "name": "_original_Foo_Bar",
-                                "nodeType": "FunctionDefinition",
-                                "overrides": null,
-                                "parameters": {
-                                    "id": 34,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "352:2:0"
-                                },
-                                "returnParameters": {
-                                    "id": 37,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 36,
-                                            "mutability": "mutable",
-                                            "name": "",
-                                            "nodeType": "VariableDeclaration",
-                                            "overrides": null,
-                                            "scope": 151,
-                                            "src": "377:6:0",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_int256",
-                                                "typeString": "int256"
-                                            },
-                                            "typeName": {
-                                                "id": 35,
-                                                "name": "int256",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "377:6:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "376:8:0"
-                                },
-                                "scope": 171,
-                                "src": "326:914:0",
-                                "stateMutability": "view",
-                                "virtual": false,
-                                "visibility": "private"
-                            },
-                            {
-                                "body": {
-                                    "id": 169,
-                                    "nodeType": "Block",
-                                    "src": "1278:42:0",
-                                    "statements": [
-                                        {
-                                            "expression": {
-                                                "argumentTypes": null,
-                                                "id": 167,
-                                                "isConstant": false,
-                                                "isLValue": false,
-                                                "isPure": false,
-                                                "lValueRequested": false,
-                                                "leftHandSide": {
-                                                    "argumentTypes": null,
-                                                    "id": 156,
-                                                    "name": "x",
-                                                    "nodeType": "Identifier",
-                                                    "overloadedDeclarations": [],
-                                                    "referencedDeclaration": 7,
-                                                    "src": "1288:1:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "nodeType": "Assignment",
-                                                "operator": "=",
-                                                "rightHandSide": {
-                                                    "argumentTypes": null,
-                                                    "commonType": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    },
-                                                    "id": 166,
-                                                    "isConstant": false,
-                                                    "isLValue": false,
-                                                    "isPure": false,
-                                                    "lValueRequested": false,
-                                                    "leftExpression": {
-                                                        "argumentTypes": null,
-                                                        "components": [
-                                                            {
-                                                                "argumentTypes": null,
-                                                                "commonType": {
-                                                                    "typeIdentifier": "t_int256",
-                                                                    "typeString": "int256"
-                                                                },
-                                                                "id": 159,
-                                                                "isConstant": false,
-                                                                "isLValue": false,
-                                                                "isPure": false,
-                                                                "lValueRequested": false,
-                                                                "leftExpression": {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "32",
-                                                                    "id": 157,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "number",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "1293:1:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_rational_2_by_1",
-                                                                        "typeString": "int_const 2"
-                                                                    },
-                                                                    "value": "2"
-                                                                },
-                                                                "nodeType": "BinaryOperation",
-                                                                "operator": "*",
-                                                                "rightExpression": {
-                                                                    "argumentTypes": null,
-                                                                    "id": 158,
-                                                                    "name": "x",
-                                                                    "nodeType": "Identifier",
-                                                                    "overloadedDeclarations": [],
-                                                                    "referencedDeclaration": 7,
-                                                                    "src": "1297:1:0",
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_int256",
-                                                                        "typeString": "int256"
-                                                                    }
-                                                                },
-                                                                "src": "1293:5:0",
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_int256",
-                                                                    "typeString": "int256"
-                                                                }
-                                                            }
-                                                        ],
-                                                        "id": 160,
-                                                        "isConstant": false,
-                                                        "isInlineArray": false,
-                                                        "isLValue": false,
-                                                        "isPure": false,
-                                                        "lValueRequested": false,
-                                                        "nodeType": "TupleExpression",
-                                                        "src": "1292:7:0",
-                                                        "typeDescriptions": {
-                                                            "typeIdentifier": "t_int256",
-                                                            "typeString": "int256"
-                                                        }
-                                                    },
-                                                    "nodeType": "BinaryOperation",
-                                                    "operator": "+",
-                                                    "rightExpression": {
-                                                        "argumentTypes": null,
-                                                        "components": [
-                                                            {
-                                                                "argumentTypes": null,
-                                                                "condition": {
-                                                                    "argumentTypes": null,
-                                                                    "id": 161,
-                                                                    "name": "b",
-                                                                    "nodeType": "Identifier",
-                                                                    "overloadedDeclarations": [],
-                                                                    "referencedDeclaration": 153,
-                                                                    "src": "1303:1:0",
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_bool",
-                                                                        "typeString": "bool"
-                                                                    }
-                                                                },
-                                                                "falseExpression": {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "30",
-                                                                    "id": 163,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "number",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "1311:1:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_rational_0_by_1",
-                                                                        "typeString": "int_const 0"
-                                                                    },
-                                                                    "value": "0"
-                                                                },
-                                                                "id": 164,
-                                                                "isConstant": false,
-                                                                "isLValue": false,
-                                                                "isPure": false,
-                                                                "lValueRequested": false,
-                                                                "nodeType": "Conditional",
-                                                                "src": "1303:9:0",
-                                                                "trueExpression": {
-                                                                    "argumentTypes": null,
-                                                                    "hexValue": "31",
-                                                                    "id": 162,
-                                                                    "isConstant": false,
-                                                                    "isLValue": false,
-                                                                    "isPure": true,
-                                                                    "kind": "number",
-                                                                    "lValueRequested": false,
-                                                                    "nodeType": "Literal",
-                                                                    "src": "1307:1:0",
-                                                                    "subdenomination": null,
-                                                                    "typeDescriptions": {
-                                                                        "typeIdentifier": "t_rational_1_by_1",
-                                                                        "typeString": "int_const 1"
-                                                                    },
-                                                                    "value": "1"
-                                                                },
-                                                                "typeDescriptions": {
-                                                                    "typeIdentifier": "t_uint8",
-                                                                    "typeString": "uint8"
-                                                                }
-                                                            }
-                                                        ],
-                                                        "id": 165,
-                                                        "isConstant": false,
-                                                        "isInlineArray": false,
-                                                        "isLValue": false,
-                                                        "isPure": false,
-                                                        "lValueRequested": false,
-                                                        "nodeType": "TupleExpression",
-                                                        "src": "1302:11:0",
-                                                        "typeDescriptions": {
-                                                            "typeIdentifier": "t_uint8",
-                                                            "typeString": "uint8"
-                                                        }
-                                                    },
-                                                    "src": "1292:21:0",
-                                                    "typeDescriptions": {
-                                                        "typeIdentifier": "t_int256",
-                                                        "typeString": "int256"
-                                                    }
-                                                },
-                                                "src": "1288:25:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_int256",
-                                                    "typeString": "int256"
-                                                }
-                                            },
-                                            "id": 168,
-                                            "nodeType": "ExpressionStatement",
-                                            "src": "1288:25:0"
-                                        }
-                                    ]
-                                },
-                                "documentation": null,
-                                "functionSelector": "df5b7227",
-                                "id": 170,
-                                "implemented": true,
-                                "kind": "function",
-                                "modifiers": [],
-                                "name": "SetNext",
-                                "nodeType": "FunctionDefinition",
-                                "overrides": null,
-                                "parameters": {
-                                    "id": 154,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [
-                                        {
-                                            "constant": false,
-                                            "id": 153,
-                                            "mutability": "mutable",
-                                            "name": "b",
-                                            "nodeType": "VariableDeclaration",
-                                            "overrides": null,
-                                            "scope": 170,
-                                            "src": "1263:6:0",
-                                            "stateVariable": false,
-                                            "storageLocation": "default",
-                                            "typeDescriptions": {
-                                                "typeIdentifier": "t_bool",
-                                                "typeString": "bool"
-                                            },
-                                            "typeName": {
-                                                "id": 152,
-                                                "name": "bool",
-                                                "nodeType": "ElementaryTypeName",
-                                                "src": "1263:4:0",
-                                                "typeDescriptions": {
-                                                    "typeIdentifier": "t_bool",
-                                                    "typeString": "bool"
-                                                }
-                                            },
-                                            "value": null,
-                                            "visibility": "internal"
-                                        }
-                                    ],
-                                    "src": "1262:8:0"
-                                },
-                                "returnParameters": {
-                                    "id": 155,
-                                    "nodeType": "ParameterList",
-                                    "parameters": [],
-                                    "src": "1278:0:0"
-                                },
-                                "scope": 171,
-                                "src": "1246:74:0",
-                                "stateMutability": "nonpayable",
-                                "virtual": false,
-                                "visibility": "public"
-                            }
-                        ],
-                        "scope": 172,
-                        "src": "25:1297:0"
-                    }
-                ],
-                "src": "0:1322:0"
-            }
-        }
-    },
-    "contracts": [
-        {
-            "sourcePaths": {
-                "0": "contracts/sample.sol"
-            },
-            "deployedSourceMap": "25:1297:0:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;111:209;;;:::i;:::-;;;;;;;;;;;;;;;;1246:74;;;;;;;;;;;;;;;;-1:-1:-1;1246:74:0;;;;:::i;:::-;;111:209;142:12;174:19;:17;:19::i;:::-;166:27;;209:1;;214:2;209:7;203:111;;238:38;;;;;;;;;;;;-1:-1:-1;;;238:38:0;;;;;;;;;;;;;;;290:13;;111:209;:::o;1246:74::-;1303:1;:9;;1311:1;1303:9;;;1307:1;1303:9;1292:21;;1297:1;;1293;:5;1292:21;1288:1;:25;;;;1246:74;:::o;326:914::-;377:6;399:1;;404:2;399:7;395:73;;;422:13;395:73;481:1;;486:2;481:7;477:73;;;504:13;477:73;563:1;;568:2;563:7;559:73;;;586:13;559:73;645:1;;650:2;645:7;641:73;;;668:13;641:73;727:1;;732:2;727:7;723:73;;;750:13;723:73;809:1;;814:3;809:8;805:75;;;833:13;805:75;893:1;;898:3;893:8;889:75;;;917:13;889:75;977:1;;982:3;977:8;973:75;;;1001:13;973:75;1061:1;;1066:3;1061:8;1057:75;;;1085:13;1057:75;1145:1;;1150:3;1145:8;1141:75;;;1169:13;1141:75;-1:-1:-1;1232:1:0;326:914;:::o",
-            "deployedBytecode": "608060405234801561001057600080fd5b50600436106100365760003560e01c8063b0a378b01461003b578063df5b722714610055575b600080fd5b610043610076565b60408051918252519081900360200190f35b6100746004803603602081101561006b57600080fd5b503515156100e7565b005b6000610080610109565b90506000546013146100e457604080516020808252601390820152720c0e88151a1a5cc81cda1bdd5b190819985a5b606a1b8183015290517fb42604cb105a16c8f6db8a41e6b00c0c1b4826465e8bc504b3eb3e88b3e6a4a09181900360600190a1fe5b90565b806100f35760006100f6565b60015b60ff166000546002020160008190555050565b60008054600a141561011757fe5b600054601e141561012457fe5b6000546032141561013157fe5b6000546046141561013e57fe5b600054605a141561014b57fe5b600054606e141561015857fe5b6000546082141561016557fe5b6000546096141561017257fe5b60005460aa141561017f57fe5b60005460be141561018c57fe5b5060009056fea2646970667358221220d15c0974595ed5c9a5da68377d16635bfa92f13a2af22bf0b52f63632505f04664736f6c634300060c0033",
-            "sourceMap": "25:1297:0:-:0;;;;;;;;;;;;;;;;;;;",
-            "bytecode": "608060405234801561001057600080fd5b506101c8806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063b0a378b01461003b578063df5b722714610055575b600080fd5b610043610076565b60408051918252519081900360200190f35b6100746004803603602081101561006b57600080fd5b503515156100e7565b005b6000610080610109565b90506000546013146100e457604080516020808252601390820152720c0e88151a1a5cc81cda1bdd5b190819985a5b606a1b8183015290517fb42604cb105a16c8f6db8a41e6b00c0c1b4826465e8bc504b3eb3e88b3e6a4a09181900360600190a1fe5b90565b806100f35760006100f6565b60015b60ff166000546002020160008190555050565b60008054600a141561011757fe5b600054601e141561012457fe5b6000546032141561013157fe5b6000546046141561013e57fe5b600054605a141561014b57fe5b600054606e141561015857fe5b6000546082141561016557fe5b6000546096141561017257fe5b60005460aa141561017f57fe5b60005460be141561018c57fe5b5060009056fea2646970667358221220d15c0974595ed5c9a5da68377d16635bfa92f13a2af22bf0b52f63632505f04664736f6c634300060c0033",
-            "contractName": "Foo",
-            "mainSourceFile": "contracts/sample.sol"
-        }
-    ],
-    "instrumentation_metadata": {
-        "instrToOriginalMap": [
-            [
-                "0:23:0",
-                "0:23:0"
-            ],
-            [
-                "25:1297:0",
-                "24:852:0"
-            ],
-            [
-                "88:16:0",
-                "41:16:0"
-            ],
-            [
-                "88:6:0",
-                "41:6:0"
-            ],
-            [
-                "326:914:0",
-                "114:693:0"
-            ],
-            [
-                "352:2:0",
-                "126:2:0"
-            ],
-            [
-                "376:8:0",
-                "149:8:0"
-            ],
-            [
-                "377:6:0",
-                "150:6:0"
-            ],
-            [
-                "377:6:0",
-                "150:6:0"
-            ],
-            [
-                "385:855:0",
-                "158:649:0"
-            ],
-            [
-                "395:73:0",
-                "164:57:0"
-            ],
-            [
-                "399:7:0",
-                "168:7:0"
-            ],
-            [
-                "399:1:0",
-                "168:1:0"
-            ],
-            [
-                "404:2:0",
-                "173:2:0"
-            ],
-            [
-                "408:60:0",
-                "177:44:0"
-            ],
-            [
-                "422:13:0",
-                "185:13:0"
-            ],
-            [
-                "422:13:0",
-                "185:13:0"
-            ],
-            [
-                "422:6:0",
-                "185:6:0"
-            ],
-            [
-                "429:5:0",
-                "192:5:0"
-            ],
-            [
-                "449:8:0",
-                "206:8:0"
-            ],
-            [
-                "456:1:0",
-                "213:1:0"
-            ],
-            [
-                "477:73:0",
-                "226:57:0"
-            ],
-            [
-                "481:7:0",
-                "230:7:0"
-            ],
-            [
-                "481:1:0",
-                "230:1:0"
-            ],
-            [
-                "486:2:0",
-                "235:2:0"
-            ],
-            [
-                "490:60:0",
-                "239:44:0"
-            ],
-            [
-                "504:13:0",
-                "247:13:0"
-            ],
-            [
-                "504:13:0",
-                "247:13:0"
-            ],
-            [
-                "504:6:0",
-                "247:6:0"
-            ],
-            [
-                "511:5:0",
-                "254:5:0"
-            ],
-            [
-                "531:8:0",
-                "268:8:0"
-            ],
-            [
-                "538:1:0",
-                "275:1:0"
-            ],
-            [
-                "559:73:0",
-                "288:57:0"
-            ],
-            [
-                "563:7:0",
-                "292:7:0"
-            ],
-            [
-                "563:1:0",
-                "292:1:0"
-            ],
-            [
-                "568:2:0",
-                "297:2:0"
-            ],
-            [
-                "572:60:0",
-                "301:44:0"
-            ],
-            [
-                "586:13:0",
-                "309:13:0"
-            ],
-            [
-                "586:13:0",
-                "309:13:0"
-            ],
-            [
-                "586:6:0",
-                "309:6:0"
-            ],
-            [
-                "593:5:0",
-                "316:5:0"
-            ],
-            [
-                "613:8:0",
-                "330:8:0"
-            ],
-            [
-                "620:1:0",
-                "337:1:0"
-            ],
-            [
-                "641:73:0",
-                "350:57:0"
-            ],
-            [
-                "645:7:0",
-                "354:7:0"
-            ],
-            [
-                "645:1:0",
-                "354:1:0"
-            ],
-            [
-                "650:2:0",
-                "359:2:0"
-            ],
-            [
-                "654:60:0",
-                "363:44:0"
-            ],
-            [
-                "668:13:0",
-                "371:13:0"
-            ],
-            [
-                "668:13:0",
-                "371:13:0"
-            ],
-            [
-                "668:6:0",
-                "371:6:0"
-            ],
-            [
-                "675:5:0",
-                "378:5:0"
-            ],
-            [
-                "695:8:0",
-                "392:8:0"
-            ],
-            [
-                "702:1:0",
-                "399:1:0"
-            ],
-            [
-                "723:73:0",
-                "412:57:0"
-            ],
-            [
-                "727:7:0",
-                "416:7:0"
-            ],
-            [
-                "727:1:0",
-                "416:1:0"
-            ],
-            [
-                "732:2:0",
-                "421:2:0"
-            ],
-            [
-                "736:60:0",
-                "425:44:0"
-            ],
-            [
-                "750:13:0",
-                "433:13:0"
-            ],
-            [
-                "750:13:0",
-                "433:13:0"
-            ],
-            [
-                "750:6:0",
-                "433:6:0"
-            ],
-            [
-                "757:5:0",
-                "440:5:0"
-            ],
-            [
-                "777:8:0",
-                "454:8:0"
-            ],
-            [
-                "784:1:0",
-                "461:1:0"
-            ],
-            [
-                "805:75:0",
-                "474:59:0"
-            ],
-            [
-                "809:8:0",
-                "478:8:0"
-            ],
-            [
-                "809:1:0",
-                "478:1:0"
-            ],
-            [
-                "814:3:0",
-                "483:3:0"
-            ],
-            [
-                "819:61:0",
-                "488:45:0"
-            ],
-            [
-                "833:13:0",
-                "496:13:0"
-            ],
-            [
-                "833:13:0",
-                "496:13:0"
-            ],
-            [
-                "833:6:0",
-                "496:6:0"
-            ],
-            [
-                "840:5:0",
-                "503:5:0"
-            ],
-            [
-                "860:9:0",
-                "517:9:0"
-            ],
-            [
-                "867:2:0",
-                "524:2:0"
-            ],
-            [
-                "889:75:0",
-                "538:59:0"
-            ],
-            [
-                "893:8:0",
-                "542:8:0"
-            ],
-            [
-                "893:1:0",
-                "542:1:0"
-            ],
-            [
-                "898:3:0",
-                "547:3:0"
-            ],
-            [
-                "903:61:0",
-                "552:45:0"
-            ],
-            [
-                "917:13:0",
-                "560:13:0"
-            ],
-            [
-                "917:13:0",
-                "560:13:0"
-            ],
-            [
-                "917:6:0",
-                "560:6:0"
-            ],
-            [
-                "924:5:0",
-                "567:5:0"
-            ],
-            [
-                "944:9:0",
-                "581:9:0"
-            ],
-            [
-                "951:2:0",
-                "588:2:0"
-            ],
-            [
-                "973:75:0",
-                "602:59:0"
-            ],
-            [
-                "977:8:0",
-                "606:8:0"
-            ],
-            [
-                "977:1:0",
-                "606:1:0"
-            ],
-            [
-                "982:3:0",
-                "611:3:0"
-            ],
-            [
-                "987:61:0",
-                "616:45:0"
-            ],
-            [
-                "1001:13:0",
-                "624:13:0"
-            ],
-            [
-                "1001:13:0",
-                "624:13:0"
-            ],
-            [
-                "1001:6:0",
-                "624:6:0"
-            ],
-            [
-                "1008:5:0",
-                "631:5:0"
-            ],
-            [
-                "1028:9:0",
-                "645:9:0"
-            ],
-            [
-                "1035:2:0",
-                "652:2:0"
-            ],
-            [
-                "1057:75:0",
-                "666:59:0"
-            ],
-            [
-                "1061:8:0",
-                "670:8:0"
-            ],
-            [
-                "1061:1:0",
-                "670:1:0"
-            ],
-            [
-                "1066:3:0",
-                "675:3:0"
-            ],
-            [
-                "1071:61:0",
-                "680:45:0"
-            ],
-            [
-                "1085:13:0",
-                "688:13:0"
-            ],
-            [
-                "1085:13:0",
-                "688:13:0"
-            ],
-            [
-                "1085:6:0",
-                "688:6:0"
-            ],
-            [
-                "1092:5:0",
-                "695:5:0"
-            ],
-            [
-                "1112:9:0",
-                "709:9:0"
-            ],
-            [
-                "1119:2:0",
-                "716:2:0"
-            ],
-            [
-                "1141:75:0",
-                "730:59:0"
-            ],
-            [
-                "1145:8:0",
-                "734:8:0"
-            ],
-            [
-                "1145:1:0",
-                "734:1:0"
-            ],
-            [
-                "1150:3:0",
-                "739:3:0"
-            ],
-            [
-                "1155:61:0",
-                "744:45:0"
-            ],
-            [
-                "1169:13:0",
-                "752:13:0"
-            ],
-            [
-                "1169:13:0",
-                "752:13:0"
-            ],
-            [
-                "1169:6:0",
-                "752:6:0"
-            ],
-            [
-                "1176:5:0",
-                "759:5:0"
-            ],
-            [
-                "1196:9:0",
-                "773:9:0"
-            ],
-            [
-                "1203:2:0",
-                "780:2:0"
-            ],
-            [
-                "1225:8:0",
-                "794:8:0"
-            ],
-            [
-                "1232:1:0",
-                "801:1:0"
-            ],
-            [
-                "1246:74:0",
-                "810:64:0"
-            ],
-            [
-                "1262:8:0",
-                "826:8:0"
-            ],
-            [
-                "1263:6:0",
-                "827:6:0"
-            ],
-            [
-                "1263:4:0",
-                "827:4:0"
-            ],
-            [
-                "1278:42:0",
-                "842:32:0"
-            ],
-            [
-                "1288:25:0",
-                "848:21:0"
-            ],
-            [
-                "1288:25:0",
-                "848:21:0"
-            ],
-            [
-                "1288:1:0",
-                "848:1:0"
-            ],
-            [
-                "1292:21:0",
-                "852:17:0"
-            ],
-            [
-                "1293:5:0",
-                "852:3:0"
-            ],
-            [
-                "1293:1:0",
-                "852:1:0"
-            ],
-            [
-                "1297:1:0",
-                "854:1:0"
-            ],
-            [
-                "1302:11:0",
-                "858:11:0"
-            ],
-            [
-                "1303:9:0",
-                "859:9:0"
-            ],
-            [
-                "1303:1:0",
-                "859:1:0"
-            ],
-            [
-                "1307:1:0",
-                "863:1:0"
-            ],
-            [
-                "1311:1:0",
-                "867:1:0"
-            ],
-            [
-                "207:10:0",
-                "65:46:0"
-            ]
-        ],
-        "otherInstrumentation": [
-            "111:38:1",
-            "142:12:0",
-            "166:27:0"
-        ],
-        "propertyMap": [
-            {
-                "id": 0,
-                "contract": "Foo",
-                "filename": "contracts/sample.sol",
-                "propertySource": "103:7:0",
-                "annotationSource": "65:46:0",
-                "target": "function",
-                "targetName": "Bar",
-                "debugEventSignature": "",
-                "message": "This should fail",
-                "instrumentationRanges": [
-                    "233:43:0",
-                    "203:111:0"
-                ],
-                "checkRanges": [
-                    "207:10:0"
-                ]
-            }
-        ],
-        "originalSourceList": [
-            "contracts/sample.sol.original"
-        ],
-        "instrSourceList": [
-            "contracts/sample.sol.instrumented",
-            "/Users/boss/git/mythx/truffle-projects/brownie-test/contracts/__scribble_ReentrancyUtils.sol"
-        ]
-    }
-}
diff --git a/tests/testdata/faas-new-campaign-response.json b/tests/testdata/faas-new-campaign-response.json
deleted file mode 100644
index a51bbda..0000000
--- a/tests/testdata/faas-new-campaign-response.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "name": "brownie_test_yqzeu",
-    "multiContract": true,
-    "project": "00000000-0000-0000-0000-000000000000",
-    "corpus": "720f76a1-3be1-4aaa-862f-9e3d28e352e5",
-    "numSources": 1,
-    "status": "idle",
-    "submittedAt": "2021-03-30T16:17:18.389281",
-    "id": "560ba03a-8744-4da6-aeaa-a62568ccbf44"
-}
diff --git a/tests/testdata/group-creation-response.json b/tests/testdata/group-creation-response.json
deleted file mode 100644
index d849490..0000000
--- a/tests/testdata/group-creation-response.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "id": "test",
-    "name": "test",
-    "createdAt": "2019-10-30T00:52:12.000Z",
-    "createdBy": "test",
-    "completedAt": "2019-10-30T00:52:12.000Z",
-    "progress": 0,
-    "status": "opened",
-    "mainSourceFiles": [
-        "test"
-    ],
-    "numAnalyses": {
-        "total": 0,
-        "queued": 0,
-        "running": 0,
-        "failed": 0,
-        "finished": 0
-    },
-    "numVulnerabilities": {
-        "high": 0,
-        "medium": 0,
-        "low": 0,
-        "none": 0
-    }
-}
diff --git a/tests/testdata/group-list-response.json b/tests/testdata/group-list-response.json
deleted file mode 100644
index c04e30a..0000000
--- a/tests/testdata/group-list-response.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "groups": [
-        {
-            "id": "5dd415a72ef82f0012f2e3a0",
-            "name": "",
-            "createdAt": "2019-11-19T16:17:43.426Z",
-            "createdBy": "5cefb9a4f50eaf001757f57d",
-            "completedAt": "2019-11-19T16:19:24.590Z",
-            "progress": 100,
-            "mainSourceFiles": [
-                "/home/spoons/diligence/mythx-qa/BECToken.sol",
-                "/home/spoons/diligence/mythx-qa/remythx-mbt385.sol",
-                "/home/spoons/diligence/mythx-qa/functiontypes-swc127.sol"
-            ],
-            "status": "opened",
-            "numAnalyses": {
-                "total": 3,
-                "queued": 0,
-                "running": 0,
-                "failed": 0,
-                "finished": 3
-            },
-            "numVulnerabilities": {
-                "high": 4,
-                "medium": 8,
-                "low": 9,
-                "none": 0
-            }
-        },
-        {
-            "id": "5dd40ca50d861d001101e888",
-            "name": "test",
-            "createdAt": "2019-11-19T15:39:17.714Z",
-            "createdBy": "5cefb9a4f50eaf001757f57d",
-            "completedAt": "2019-11-19T15:39:17.714Z",
-            "progress": 100,
-            "mainSourceFiles": [],
-            "status": "sealed",
-            "numAnalyses": {
-                "total": 0,
-                "queued": 0,
-                "running": 0,
-                "failed": 0,
-                "finished": 0
-            },
-            "numVulnerabilities": {
-                "high": 0,
-                "medium": 0,
-                "low": 0,
-                "none": 0
-            }
-        },
-        {
-            "id": "5dd408f7b1380a0011e8a166",
-            "name": "",
-            "createdAt": "2019-11-19T15:23:35.258Z",
-            "createdBy": "5cefb9a4f50eaf001757f57d",
-            "completedAt": "2019-11-19T15:39:17.714Z",
-            "progress": 100,
-            "mainSourceFiles": [],
-            "status": "sealed",
-            "numAnalyses": {
-                "total": 0,
-                "queued": 0,
-                "running": 0,
-                "failed": 0,
-                "finished": 0
-            },
-            "numVulnerabilities": {
-                "high": 0,
-                "medium": 0,
-                "low": 0,
-                "none": 0
-            }
-        },
-        {
-            "id": "5dd408d6519bf1001254baf2",
-            "name": "",
-            "createdAt": "2019-11-19T15:23:02.506Z",
-            "createdBy": "5cefb9a4f50eaf001757f57d",
-            "completedAt": "2019-11-19T15:39:17.714Z",
-            "progress": 100,
-            "mainSourceFiles": [],
-            "status": "sealed",
-            "numAnalyses": {
-                "total": 0,
-                "queued": 0,
-                "running": 0,
-                "failed": 0,
-                "finished": 0
-            },
-            "numVulnerabilities": {
-                "high": 0,
-                "medium": 0,
-                "low": 0,
-                "none": 0
-            }
-        },
-        {
-            "id": "5dd408d1b1380a0011e8a163",
-            "name": "",
-            "createdAt": "2019-11-19T15:22:57.831Z",
-            "createdBy": "5cefb9a4f50eaf001757f57d",
-            "completedAt": "2019-11-19T15:39:17.714Z",
-            "progress": 100,
-            "mainSourceFiles": [],
-            "status": "sealed",
-            "numAnalyses": {
-                "total": 0,
-                "queued": 0,
-                "running": 0,
-                "failed": 0,
-                "finished": 0
-            },
-            "numVulnerabilities": {
-                "high": 0,
-                "medium": 0,
-                "low": 0,
-                "none": 0
-            }
-        }
-    ],
-    "total": 5
-}
diff --git a/tests/testdata/group-list-simple.txt b/tests/testdata/group-list-simple.txt
deleted file mode 100644
index 0714f61..0000000
--- a/tests/testdata/group-list-simple.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-ID: 5dd415a72ef82f0012f2e3a0
-Name: <unnamed>
-Created on: 2019-11-19T16:17:43.426Z
-Status: opened
-
-ID: 5dd40ca50d861d001101e888
-Name: test
-Created on: 2019-11-19T15:39:17.714Z
-Status: sealed
-
-ID: 5dd408f7b1380a0011e8a166
-Name: <unnamed>
-Created on: 2019-11-19T15:23:35.258Z
-Status: sealed
-
-ID: 5dd408d6519bf1001254baf2
-Name: <unnamed>
-Created on: 2019-11-19T15:23:02.506Z
-Status: sealed
-
-ID: 5dd408d1b1380a0011e8a163
-Name: <unnamed>
-Created on: 2019-11-19T15:22:57.831Z
-Status: sealed
-
diff --git a/tests/testdata/group-list-table.txt b/tests/testdata/group-list-table.txt
deleted file mode 100644
index 1c62240..0000000
--- a/tests/testdata/group-list-table.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-╒══════════════════════════╤════════╤══════════════════════════════════════════════════════════╤══════════════════════════╕
-│ 5dd415a72ef82f0012f2e3a0 │ opened │ BECToken.sol,remythx-mbt385.sol,functiontypes-swc127.sol │ 2019-11-19T16:17:43.426Z │
-├──────────────────────────┼────────┼──────────────────────────────────────────────────────────┼──────────────────────────┤
-│ 5dd40ca50d861d001101e888 │ sealed │                                                          │ 2019-11-19T15:39:17.714Z │
-├──────────────────────────┼────────┼──────────────────────────────────────────────────────────┼──────────────────────────┤
-│ 5dd408f7b1380a0011e8a166 │ sealed │                                                          │ 2019-11-19T15:23:35.258Z │
-├──────────────────────────┼────────┼──────────────────────────────────────────────────────────┼──────────────────────────┤
-│ 5dd408d6519bf1001254baf2 │ sealed │                                                          │ 2019-11-19T15:23:02.506Z │
-├──────────────────────────┼────────┼──────────────────────────────────────────────────────────┼──────────────────────────┤
-│ 5dd408d1b1380a0011e8a163 │ sealed │                                                          │ 2019-11-19T15:22:57.831Z │
-╘══════════════════════════╧════════╧══════════════════════════════════════════════════════════╧══════════════════════════╛
diff --git a/tests/testdata/group-status-response.json b/tests/testdata/group-status-response.json
deleted file mode 100644
index 8d2fd17..0000000
--- a/tests/testdata/group-status-response.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "id": "5dd40ca50d861d001101e888",
-    "name": "test",
-    "createdAt": "2019-11-19T15:39:17.714Z",
-    "createdBy": "5cefb9a4f50eaf001757f57d",
-    "completedAt": "2019-09-05T20:34:27.606Z",
-    "progress": 100,
-    "mainSourceFiles": [],
-    "status": "sealed",
-    "numAnalyses": {
-        "total": 0,
-        "queued": 0,
-        "running": 0,
-        "failed": 0,
-        "finished": 0
-    },
-    "numVulnerabilities": {
-        "high": 0,
-        "medium": 0,
-        "low": 0,
-        "none": 0
-    }
-}
diff --git a/tests/testdata/group-status-simple.txt b/tests/testdata/group-status-simple.txt
deleted file mode 100644
index 8cea791..0000000
--- a/tests/testdata/group-status-simple.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-ID: 5dd40ca50d861d001101e888
-Name: test
-Created on: 2019-11-19T15:39:17.714Z
-Status: sealed
-
diff --git a/tests/testdata/group-status-table.txt b/tests/testdata/group-status-table.txt
deleted file mode 100644
index fcfd34e..0000000
--- a/tests/testdata/group-status-table.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-╒══════════════════════════════════╤══════════════════════════╕
-│ ID                               │ 5dd40ca50d861d001101e888 │
-├──────────────────────────────────┼──────────────────────────┤
-│ Name                             │ test                     │
-├──────────────────────────────────┼──────────────────────────┤
-│ Creation Date                    │ 2019-11-19T15:39:17.714Z │
-├──────────────────────────────────┼──────────────────────────┤
-│ Created By                       │ 5cefb9a4f50eaf001757f57d │
-├──────────────────────────────────┼──────────────────────────┤
-│ Progress                         │ 100/100                  │
-├──────────────────────────────────┼──────────────────────────┤
-│ Main Sources                     │                          │
-├──────────────────────────────────┼──────────────────────────┤
-│ Status                           │ Sealed                   │
-├──────────────────────────────────┼──────────────────────────┤
-│ Queued Analyses                  │ 0                        │
-├──────────────────────────────────┼──────────────────────────┤
-│ Running Analyses                 │ 0                        │
-├──────────────────────────────────┼──────────────────────────┤
-│ Failed Analyses                  │ 0                        │
-├──────────────────────────────────┼──────────────────────────┤
-│ Finished Analyses                │ 0                        │
-├──────────────────────────────────┼──────────────────────────┤
-│ Total Analyses                   │ 0                        │
-├──────────────────────────────────┼──────────────────────────┤
-│ High Severity Vulnerabilities    │ 0                        │
-├──────────────────────────────────┼──────────────────────────┤
-│ Medium Severity Vulnerabilities  │ 0                        │
-├──────────────────────────────────┼──────────────────────────┤
-│ Low Severity Vulnerabilities     │ 0                        │
-├──────────────────────────────────┼──────────────────────────┤
-│ Unknown Severity Vulnerabilities │ 0                        │
-╘══════════════════════════════════╧══════════════════════════╛
diff --git a/tests/testdata/test-ast.json b/tests/testdata/test-ast.json
deleted file mode 100644
index 2050817..0000000
--- a/tests/testdata/test-ast.json
+++ /dev/null
@@ -1,1243 +0,0 @@
-{
-    "absolutePath": "/home/spoons/diligence/mythx-qa/land/contracts/estate/EstateStorage.sol",
-    "exportedSymbols": {
-        "EstateStorage": [
-            1221
-        ],
-        "LANDRegistry": [
-            1175
-        ]
-    },
-    "id": 1222,
-    "nodeType": "SourceUnit",
-    "nodes": [
-        {
-            "id": 1123,
-            "literals": [
-                "solidity",
-                "^",
-                "0.4",
-                ".23"
-            ],
-            "nodeType": "PragmaDirective",
-            "src": "0:24:2"
-        },
-        {
-            "baseContracts": [],
-            "contractDependencies": [],
-            "contractKind": "contract",
-            "documentation": null,
-            "fullyImplemented": false,
-            "id": 1175,
-            "linearizedBaseContracts": [
-                1175
-            ],
-            "name": "LANDRegistry",
-            "nodeType": "ContractDefinition",
-            "nodes": [
-                {
-                    "body": null,
-                    "documentation": null,
-                    "id": 1132,
-                    "implemented": false,
-                    "isConstructor": false,
-                    "isDeclaredConst": true,
-                    "modifiers": [],
-                    "name": "decodeTokenId",
-                    "nodeType": "FunctionDefinition",
-                    "parameters": {
-                        "id": 1126,
-                        "nodeType": "ParameterList",
-                        "parameters": [
-                            {
-                                "constant": false,
-                                "id": 1125,
-                                "name": "value",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1132,
-                                "src": "76:10:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
-                                },
-                                "typeName": {
-                                    "id": 1124,
-                                    "name": "uint",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "76:4:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_uint256",
-                                        "typeString": "uint256"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            }
-                        ],
-                        "src": "75:12:2"
-                    },
-                    "payable": false,
-                    "returnParameters": {
-                        "id": 1131,
-                        "nodeType": "ParameterList",
-                        "parameters": [
-                            {
-                                "constant": false,
-                                "id": 1128,
-                                "name": "",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1132,
-                                "src": "111:3:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_int256",
-                                    "typeString": "int256"
-                                },
-                                "typeName": {
-                                    "id": 1127,
-                                    "name": "int",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "111:3:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_int256",
-                                        "typeString": "int256"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1130,
-                                "name": "",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1132,
-                                "src": "116:3:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_int256",
-                                    "typeString": "int256"
-                                },
-                                "typeName": {
-                                    "id": 1129,
-                                    "name": "int",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "116:3:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_int256",
-                                        "typeString": "int256"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            }
-                        ],
-                        "src": "110:10:2"
-                    },
-                    "scope": 1175,
-                    "src": "53:68:2",
-                    "stateMutability": "pure",
-                    "superFunction": null,
-                    "visibility": "external"
-                },
-                {
-                    "body": null,
-                    "documentation": null,
-                    "id": 1141,
-                    "implemented": false,
-                    "isConstructor": false,
-                    "isDeclaredConst": false,
-                    "modifiers": [],
-                    "name": "updateLandData",
-                    "nodeType": "FunctionDefinition",
-                    "parameters": {
-                        "id": 1139,
-                        "nodeType": "ParameterList",
-                        "parameters": [
-                            {
-                                "constant": false,
-                                "id": 1134,
-                                "name": "x",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1141,
-                                "src": "148:5:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_int256",
-                                    "typeString": "int256"
-                                },
-                                "typeName": {
-                                    "id": 1133,
-                                    "name": "int",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "148:3:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_int256",
-                                        "typeString": "int256"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1136,
-                                "name": "y",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1141,
-                                "src": "155:5:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_int256",
-                                    "typeString": "int256"
-                                },
-                                "typeName": {
-                                    "id": 1135,
-                                    "name": "int",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "155:3:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_int256",
-                                        "typeString": "int256"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1138,
-                                "name": "data",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1141,
-                                "src": "162:11:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_string_calldata_ptr",
-                                    "typeString": "string"
-                                },
-                                "typeName": {
-                                    "id": 1137,
-                                    "name": "string",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "162:6:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_string_storage_ptr",
-                                        "typeString": "string"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            }
-                        ],
-                        "src": "147:27:2"
-                    },
-                    "payable": false,
-                    "returnParameters": {
-                        "id": 1140,
-                        "nodeType": "ParameterList",
-                        "parameters": [],
-                        "src": "183:0:2"
-                    },
-                    "scope": 1175,
-                    "src": "124:60:2",
-                    "stateMutability": "nonpayable",
-                    "superFunction": null,
-                    "visibility": "external"
-                },
-                {
-                    "body": null,
-                    "documentation": null,
-                    "id": 1148,
-                    "implemented": false,
-                    "isConstructor": false,
-                    "isDeclaredConst": false,
-                    "modifiers": [],
-                    "name": "setUpdateOperator",
-                    "nodeType": "FunctionDefinition",
-                    "parameters": {
-                        "id": 1146,
-                        "nodeType": "ParameterList",
-                        "parameters": [
-                            {
-                                "constant": false,
-                                "id": 1143,
-                                "name": "assetId",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1148,
-                                "src": "214:15:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
-                                },
-                                "typeName": {
-                                    "id": 1142,
-                                    "name": "uint256",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "214:7:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_uint256",
-                                        "typeString": "uint256"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1145,
-                                "name": "operator",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1148,
-                                "src": "231:16:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                },
-                                "typeName": {
-                                    "id": 1144,
-                                    "name": "address",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "231:7:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            }
-                        ],
-                        "src": "213:35:2"
-                    },
-                    "payable": false,
-                    "returnParameters": {
-                        "id": 1147,
-                        "nodeType": "ParameterList",
-                        "parameters": [],
-                        "src": "257:0:2"
-                    },
-                    "scope": 1175,
-                    "src": "187:71:2",
-                    "stateMutability": "nonpayable",
-                    "superFunction": null,
-                    "visibility": "external"
-                },
-                {
-                    "body": null,
-                    "documentation": null,
-                    "id": 1151,
-                    "implemented": false,
-                    "isConstructor": false,
-                    "isDeclaredConst": false,
-                    "modifiers": [],
-                    "name": "ping",
-                    "nodeType": "FunctionDefinition",
-                    "parameters": {
-                        "id": 1149,
-                        "nodeType": "ParameterList",
-                        "parameters": [],
-                        "src": "274:2:2"
-                    },
-                    "payable": false,
-                    "returnParameters": {
-                        "id": 1150,
-                        "nodeType": "ParameterList",
-                        "parameters": [],
-                        "src": "283:0:2"
-                    },
-                    "scope": 1175,
-                    "src": "261:23:2",
-                    "stateMutability": "nonpayable",
-                    "superFunction": null,
-                    "visibility": "public"
-                },
-                {
-                    "body": null,
-                    "documentation": null,
-                    "id": 1158,
-                    "implemented": false,
-                    "isConstructor": false,
-                    "isDeclaredConst": false,
-                    "modifiers": [],
-                    "name": "ownerOf",
-                    "nodeType": "FunctionDefinition",
-                    "parameters": {
-                        "id": 1154,
-                        "nodeType": "ParameterList",
-                        "parameters": [
-                            {
-                                "constant": false,
-                                "id": 1153,
-                                "name": "tokenId",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1158,
-                                "src": "304:15:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
-                                },
-                                "typeName": {
-                                    "id": 1152,
-                                    "name": "uint256",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "304:7:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_uint256",
-                                        "typeString": "uint256"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            }
-                        ],
-                        "src": "303:17:2"
-                    },
-                    "payable": false,
-                    "returnParameters": {
-                        "id": 1157,
-                        "nodeType": "ParameterList",
-                        "parameters": [
-                            {
-                                "constant": false,
-                                "id": 1156,
-                                "name": "",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1158,
-                                "src": "337:7:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                },
-                                "typeName": {
-                                    "id": 1155,
-                                    "name": "address",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "337:7:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            }
-                        ],
-                        "src": "336:9:2"
-                    },
-                    "scope": 1175,
-                    "src": "287:59:2",
-                    "stateMutability": "nonpayable",
-                    "superFunction": null,
-                    "visibility": "public"
-                },
-                {
-                    "body": null,
-                    "documentation": null,
-                    "id": 1167,
-                    "implemented": false,
-                    "isConstructor": false,
-                    "isDeclaredConst": false,
-                    "modifiers": [],
-                    "name": "safeTransferFrom",
-                    "nodeType": "FunctionDefinition",
-                    "parameters": {
-                        "id": 1165,
-                        "nodeType": "ParameterList",
-                        "parameters": [
-                            {
-                                "constant": false,
-                                "id": 1160,
-                                "name": "",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1167,
-                                "src": "375:7:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                },
-                                "typeName": {
-                                    "id": 1159,
-                                    "name": "address",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "375:7:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1162,
-                                "name": "",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1167,
-                                "src": "384:7:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                },
-                                "typeName": {
-                                    "id": 1161,
-                                    "name": "address",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "384:7:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            },
-                            {
-                                "constant": false,
-                                "id": 1164,
-                                "name": "",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1167,
-                                "src": "393:7:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
-                                },
-                                "typeName": {
-                                    "id": 1163,
-                                    "name": "uint256",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "393:7:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_uint256",
-                                        "typeString": "uint256"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            }
-                        ],
-                        "src": "374:27:2"
-                    },
-                    "payable": false,
-                    "returnParameters": {
-                        "id": 1166,
-                        "nodeType": "ParameterList",
-                        "parameters": [],
-                        "src": "408:0:2"
-                    },
-                    "scope": 1175,
-                    "src": "349:60:2",
-                    "stateMutability": "nonpayable",
-                    "superFunction": null,
-                    "visibility": "public"
-                },
-                {
-                    "body": null,
-                    "documentation": null,
-                    "id": 1174,
-                    "implemented": false,
-                    "isConstructor": false,
-                    "isDeclaredConst": false,
-                    "modifiers": [],
-                    "name": "updateOperator",
-                    "nodeType": "FunctionDefinition",
-                    "parameters": {
-                        "id": 1170,
-                        "nodeType": "ParameterList",
-                        "parameters": [
-                            {
-                                "constant": false,
-                                "id": 1169,
-                                "name": "landId",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1174,
-                                "src": "436:14:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
-                                },
-                                "typeName": {
-                                    "id": 1168,
-                                    "name": "uint256",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "436:7:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_uint256",
-                                        "typeString": "uint256"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            }
-                        ],
-                        "src": "435:16:2"
-                    },
-                    "payable": false,
-                    "returnParameters": {
-                        "id": 1173,
-                        "nodeType": "ParameterList",
-                        "parameters": [
-                            {
-                                "constant": false,
-                                "id": 1172,
-                                "name": "",
-                                "nodeType": "VariableDeclaration",
-                                "scope": 1174,
-                                "src": "468:7:2",
-                                "stateVariable": false,
-                                "storageLocation": "default",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                },
-                                "typeName": {
-                                    "id": 1171,
-                                    "name": "address",
-                                    "nodeType": "ElementaryTypeName",
-                                    "src": "468:7:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_address",
-                                        "typeString": "address"
-                                    }
-                                },
-                                "value": null,
-                                "visibility": "internal"
-                            }
-                        ],
-                        "src": "467:9:2"
-                    },
-                    "scope": 1175,
-                    "src": "412:65:2",
-                    "stateMutability": "nonpayable",
-                    "superFunction": null,
-                    "visibility": "public"
-                }
-            ],
-            "scope": 1222,
-            "src": "27:452:2"
-        },
-        {
-            "baseContracts": [],
-            "contractDependencies": [],
-            "contractKind": "contract",
-            "documentation": null,
-            "fullyImplemented": true,
-            "id": 1221,
-            "linearizedBaseContracts": [
-                1221
-            ],
-            "name": "EstateStorage",
-            "nodeType": "ContractDefinition",
-            "nodes": [
-                {
-                    "constant": true,
-                    "id": 1182,
-                    "name": "InterfaceId_GetMetadata",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 1221,
-                    "src": "509:92:2",
-                    "stateVariable": true,
-                    "storageLocation": "default",
-                    "typeDescriptions": {
-                        "typeIdentifier": "t_bytes4",
-                        "typeString": "bytes4"
-                    },
-                    "typeName": {
-                        "id": 1176,
-                        "name": "bytes4",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "509:6:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_bytes4",
-                            "typeString": "bytes4"
-                        }
-                    },
-                    "value": {
-                        "argumentTypes": null,
-                        "arguments": [
-                            {
-                                "argumentTypes": null,
-                                "arguments": [
-                                    {
-                                        "argumentTypes": null,
-                                        "hexValue": "6765744d657461646174612875696e7432353629",
-                                        "id": 1179,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": true,
-                                        "kind": "string",
-                                        "lValueRequested": false,
-                                        "nodeType": "Literal",
-                                        "src": "577:22:2",
-                                        "subdenomination": null,
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_stringliteral_a574cea40cdd0a08ff0bc728ff4c5c786aa5857d851fdb93fd18cd5b4db07388",
-                                            "typeString": "literal_string \"getMetadata(uint256)\""
-                                        },
-                                        "value": "getMetadata(uint256)"
-                                    }
-                                ],
-                                "expression": {
-                                    "argumentTypes": [
-                                        {
-                                            "typeIdentifier": "t_stringliteral_a574cea40cdd0a08ff0bc728ff4c5c786aa5857d851fdb93fd18cd5b4db07388",
-                                            "typeString": "literal_string \"getMetadata(uint256)\""
-                                        }
-                                    ],
-                                    "id": 1178,
-                                    "name": "keccak256",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 6208,
-                                    "src": "567:9:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
-                                        "typeString": "function () pure returns (bytes32)"
-                                    }
-                                },
-                                "id": 1180,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": true,
-                                "kind": "functionCall",
-                                "lValueRequested": false,
-                                "names": [],
-                                "nodeType": "FunctionCall",
-                                "src": "567:33:2",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_bytes32",
-                                    "typeString": "bytes32"
-                                }
-                            }
-                        ],
-                        "expression": {
-                            "argumentTypes": [
-                                {
-                                    "typeIdentifier": "t_bytes32",
-                                    "typeString": "bytes32"
-                                }
-                            ],
-                            "id": 1177,
-                            "isConstant": false,
-                            "isLValue": false,
-                            "isPure": true,
-                            "lValueRequested": false,
-                            "nodeType": "ElementaryTypeNameExpression",
-                            "src": "560:6:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_bytes4_$",
-                                "typeString": "type(bytes4)"
-                            },
-                            "typeName": "bytes4"
-                        },
-                        "id": 1181,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": true,
-                        "kind": "typeConversion",
-                        "lValueRequested": false,
-                        "names": [],
-                        "nodeType": "FunctionCall",
-                        "src": "560:41:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_bytes4",
-                            "typeString": "bytes4"
-                        }
-                    },
-                    "visibility": "internal"
-                },
-                {
-                    "constant": true,
-                    "id": 1189,
-                    "name": "InterfaceId_VerifyFingerprint",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 1221,
-                    "src": "605:118:2",
-                    "stateVariable": true,
-                    "storageLocation": "default",
-                    "typeDescriptions": {
-                        "typeIdentifier": "t_bytes4",
-                        "typeString": "bytes4"
-                    },
-                    "typeName": {
-                        "id": 1183,
-                        "name": "bytes4",
-                        "nodeType": "ElementaryTypeName",
-                        "src": "605:6:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_bytes4",
-                            "typeString": "bytes4"
-                        }
-                    },
-                    "value": {
-                        "argumentTypes": null,
-                        "arguments": [
-                            {
-                                "argumentTypes": null,
-                                "arguments": [
-                                    {
-                                        "argumentTypes": null,
-                                        "hexValue": "76657269667946696e6765727072696e742875696e743235362c627974657329",
-                                        "id": 1186,
-                                        "isConstant": false,
-                                        "isLValue": false,
-                                        "isPure": true,
-                                        "kind": "string",
-                                        "lValueRequested": false,
-                                        "nodeType": "Literal",
-                                        "src": "684:34:2",
-                                        "subdenomination": null,
-                                        "typeDescriptions": {
-                                            "typeIdentifier": "t_stringliteral_8f9f4b63fb27ea36c52c6e650320201c8f2c6d7c1dfa95f40f5d5da523920168",
-                                            "typeString": "literal_string \"verifyFingerprint(uint256,bytes)\""
-                                        },
-                                        "value": "verifyFingerprint(uint256,bytes)"
-                                    }
-                                ],
-                                "expression": {
-                                    "argumentTypes": [
-                                        {
-                                            "typeIdentifier": "t_stringliteral_8f9f4b63fb27ea36c52c6e650320201c8f2c6d7c1dfa95f40f5d5da523920168",
-                                            "typeString": "literal_string \"verifyFingerprint(uint256,bytes)\""
-                                        }
-                                    ],
-                                    "id": 1185,
-                                    "name": "keccak256",
-                                    "nodeType": "Identifier",
-                                    "overloadedDeclarations": [],
-                                    "referencedDeclaration": 6208,
-                                    "src": "674:9:2",
-                                    "typeDescriptions": {
-                                        "typeIdentifier": "t_function_sha3_pure$__$returns$_t_bytes32_$",
-                                        "typeString": "function () pure returns (bytes32)"
-                                    }
-                                },
-                                "id": 1187,
-                                "isConstant": false,
-                                "isLValue": false,
-                                "isPure": true,
-                                "kind": "functionCall",
-                                "lValueRequested": false,
-                                "names": [],
-                                "nodeType": "FunctionCall",
-                                "src": "674:45:2",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_bytes32",
-                                    "typeString": "bytes32"
-                                }
-                            }
-                        ],
-                        "expression": {
-                            "argumentTypes": [
-                                {
-                                    "typeIdentifier": "t_bytes32",
-                                    "typeString": "bytes32"
-                                }
-                            ],
-                            "id": 1184,
-                            "isConstant": false,
-                            "isLValue": false,
-                            "isPure": true,
-                            "lValueRequested": false,
-                            "nodeType": "ElementaryTypeNameExpression",
-                            "src": "662:6:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_type$_t_bytes4_$",
-                                "typeString": "type(bytes4)"
-                            },
-                            "typeName": "bytes4"
-                        },
-                        "id": 1188,
-                        "isConstant": false,
-                        "isLValue": false,
-                        "isPure": true,
-                        "kind": "typeConversion",
-                        "lValueRequested": false,
-                        "names": [],
-                        "nodeType": "FunctionCall",
-                        "src": "662:61:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_bytes4",
-                            "typeString": "bytes4"
-                        }
-                    },
-                    "visibility": "internal"
-                },
-                {
-                    "constant": false,
-                    "id": 1191,
-                    "name": "registry",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 1221,
-                    "src": "728:28:2",
-                    "stateVariable": true,
-                    "storageLocation": "default",
-                    "typeDescriptions": {
-                        "typeIdentifier": "t_contract$_LANDRegistry_$1175",
-                        "typeString": "contract LANDRegistry"
-                    },
-                    "typeName": {
-                        "contractScope": null,
-                        "id": 1190,
-                        "name": "LANDRegistry",
-                        "nodeType": "UserDefinedTypeName",
-                        "referencedDeclaration": 1175,
-                        "src": "728:12:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_contract$_LANDRegistry_$1175",
-                            "typeString": "contract LANDRegistry"
-                        }
-                    },
-                    "value": null,
-                    "visibility": "public"
-                },
-                {
-                    "constant": false,
-                    "id": 1196,
-                    "name": "estateLandIds",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 1221,
-                    "src": "812:50:2",
-                    "stateVariable": true,
-                    "storageLocation": "default",
-                    "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$dyn_storage_$",
-                        "typeString": "mapping(uint256 => uint256[])"
-                    },
-                    "typeName": {
-                        "id": 1195,
-                        "keyType": {
-                            "id": 1192,
-                            "name": "uint256",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "820:7:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_uint256",
-                                "typeString": "uint256"
-                            }
-                        },
-                        "nodeType": "Mapping",
-                        "src": "812:29:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_array$_t_uint256_$dyn_storage_$",
-                            "typeString": "mapping(uint256 => uint256[])"
-                        },
-                        "valueType": {
-                            "baseType": {
-                                "id": 1193,
-                                "name": "uint256",
-                                "nodeType": "ElementaryTypeName",
-                                "src": "831:7:2",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
-                                }
-                            },
-                            "id": 1194,
-                            "length": null,
-                            "nodeType": "ArrayTypeName",
-                            "src": "831:9:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_array$_t_uint256_$dyn_storage_ptr",
-                                "typeString": "uint256[]"
-                            }
-                        }
-                    },
-                    "value": null,
-                    "visibility": "public"
-                },
-                {
-                    "constant": false,
-                    "id": 1200,
-                    "name": "landIdEstate",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 1221,
-                    "src": "915:47:2",
-                    "stateVariable": true,
-                    "storageLocation": "default",
-                    "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
-                        "typeString": "mapping(uint256 => uint256)"
-                    },
-                    "typeName": {
-                        "id": 1199,
-                        "keyType": {
-                            "id": 1197,
-                            "name": "uint256",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "923:7:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_uint256",
-                                "typeString": "uint256"
-                            }
-                        },
-                        "nodeType": "Mapping",
-                        "src": "915:27:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
-                            "typeString": "mapping(uint256 => uint256)"
-                        },
-                        "valueType": {
-                            "id": 1198,
-                            "name": "uint256",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "934:7:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_uint256",
-                                "typeString": "uint256"
-                            }
-                        }
-                    },
-                    "value": null,
-                    "visibility": "public"
-                },
-                {
-                    "constant": false,
-                    "id": 1206,
-                    "name": "estateLandIndex",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 1221,
-                    "src": "1053:70:2",
-                    "stateVariable": true,
-                    "storageLocation": "default",
-                    "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_uint256_$_t_uint256_$_$",
-                        "typeString": "mapping(uint256 => mapping(uint256 => uint256))"
-                    },
-                    "typeName": {
-                        "id": 1205,
-                        "keyType": {
-                            "id": 1201,
-                            "name": "uint256",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "1061:7:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_uint256",
-                                "typeString": "uint256"
-                            }
-                        },
-                        "nodeType": "Mapping",
-                        "src": "1053:47:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_mapping$_t_uint256_$_t_uint256_$_$",
-                            "typeString": "mapping(uint256 => mapping(uint256 => uint256))"
-                        },
-                        "valueType": {
-                            "id": 1204,
-                            "keyType": {
-                                "id": 1202,
-                                "name": "uint256",
-                                "nodeType": "ElementaryTypeName",
-                                "src": "1080:7:2",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
-                                }
-                            },
-                            "nodeType": "Mapping",
-                            "src": "1072:27:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_uint256_$_t_uint256_$",
-                                "typeString": "mapping(uint256 => uint256)"
-                            },
-                            "valueType": {
-                                "id": 1203,
-                                "name": "uint256",
-                                "nodeType": "ElementaryTypeName",
-                                "src": "1091:7:2",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_uint256",
-                                    "typeString": "uint256"
-                                }
-                            }
-                        }
-                    },
-                    "value": null,
-                    "visibility": "public"
-                },
-                {
-                    "constant": false,
-                    "id": 1210,
-                    "name": "estateData",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 1221,
-                    "src": "1156:46:2",
-                    "stateVariable": true,
-                    "storageLocation": "default",
-                    "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_string_storage_$",
-                        "typeString": "mapping(uint256 => string)"
-                    },
-                    "typeName": {
-                        "id": 1209,
-                        "keyType": {
-                            "id": 1207,
-                            "name": "uint256",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "1164:7:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_uint256",
-                                "typeString": "uint256"
-                            }
-                        },
-                        "nodeType": "Mapping",
-                        "src": "1156:26:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_string_storage_$",
-                            "typeString": "mapping(uint256 => string)"
-                        },
-                        "valueType": {
-                            "id": 1208,
-                            "name": "string",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "1175:6:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_string_storage_ptr",
-                                "typeString": "string"
-                            }
-                        }
-                    },
-                    "value": null,
-                    "visibility": "internal"
-                },
-                {
-                    "constant": false,
-                    "id": 1214,
-                    "name": "updateOperator",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 1221,
-                    "src": "1235:50:2",
-                    "stateVariable": true,
-                    "storageLocation": "default",
-                    "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_uint256_$_t_address_$",
-                        "typeString": "mapping(uint256 => address)"
-                    },
-                    "typeName": {
-                        "id": 1213,
-                        "keyType": {
-                            "id": 1211,
-                            "name": "uint256",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "1244:7:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_uint256",
-                                "typeString": "uint256"
-                            }
-                        },
-                        "nodeType": "Mapping",
-                        "src": "1235:28:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_uint256_$_t_address_$",
-                            "typeString": "mapping(uint256 => address)"
-                        },
-                        "valueType": {
-                            "id": 1212,
-                            "name": "address",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "1255:7:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_address",
-                                "typeString": "address"
-                            }
-                        }
-                    },
-                    "value": null,
-                    "visibility": "public"
-                },
-                {
-                    "constant": false,
-                    "id": 1220,
-                    "name": "updateManager",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 1221,
-                    "src": "1383:65:2",
-                    "stateVariable": true,
-                    "storageLocation": "default",
-                    "typeDescriptions": {
-                        "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
-                        "typeString": "mapping(address => mapping(address => bool))"
-                    },
-                    "typeName": {
-                        "id": 1219,
-                        "keyType": {
-                            "id": 1215,
-                            "name": "address",
-                            "nodeType": "ElementaryTypeName",
-                            "src": "1391:7:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_address",
-                                "typeString": "address"
-                            }
-                        },
-                        "nodeType": "Mapping",
-                        "src": "1383:44:2",
-                        "typeDescriptions": {
-                            "typeIdentifier": "t_mapping$_t_address_$_t_mapping$_t_address_$_t_bool_$_$",
-                            "typeString": "mapping(address => mapping(address => bool))"
-                        },
-                        "valueType": {
-                            "id": 1218,
-                            "keyType": {
-                                "id": 1216,
-                                "name": "address",
-                                "nodeType": "ElementaryTypeName",
-                                "src": "1410:7:2",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_address",
-                                    "typeString": "address"
-                                }
-                            },
-                            "nodeType": "Mapping",
-                            "src": "1402:24:2",
-                            "typeDescriptions": {
-                                "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
-                                "typeString": "mapping(address => bool)"
-                            },
-                            "valueType": {
-                                "id": 1217,
-                                "name": "bool",
-                                "nodeType": "ElementaryTypeName",
-                                "src": "1421:4:2",
-                                "typeDescriptions": {
-                                    "typeIdentifier": "t_bool",
-                                    "typeString": "bool"
-                                }
-                            }
-                        }
-                    },
-                    "value": null,
-                    "visibility": "public"
-                }
-            ],
-            "scope": 1222,
-            "src": "482:970:2"
-        }
-    ],
-    "src": "0:1453:2"
-}
diff --git a/tests/testdata/truffle-artifact.json b/tests/testdata/truffle-artifact.json
index 746a69c..174fff5 100644
--- a/tests/testdata/truffle-artifact.json
+++ b/tests/testdata/truffle-artifact.json
@@ -209,15 +209,15 @@
       "type": "event"
     }
   ],
-  "metadata": "{\"compiler\":{\"version\":\"0.4.24+commit.e67f0147\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":true,\"inputs\":[],\"name\":\"proxyOwner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"},{\"name\":\"\",\"type\":\"address\"}],\"name\":\"updateManager\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"}],\"name\":\"latestPing\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"}],\"name\":\"authorizedDeploy\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"currentContract\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"updateOperator\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"newContract\",\"type\":\"address\"},{\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"upgrade\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"estateRegistry\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"fallback\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"newContract\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"initializedWith\",\"type\":\"bytes\"}],\"name\":\"Upgrade\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"_prevOwner\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"OwnerUpdate\",\"type\":\"event\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/spoons/diligence/mythx-qa/land/contracts/upgradable/LANDProxy.sol\":\"LANDProxy\"},\"evmVersion\":\"byzantium\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/spoons/diligence/mythx-qa/land/contracts/Storage.sol\":{\"keccak256\":\"0x1cd5939d775d44ade927d2e2de4895341eb6e6336738e8654619bb8899f6c095\",\"urls\":[\"bzzr://41cfaeaa792546fd97905ce166f33670fbf0fed545432fe5da7e573131a87f89\"]},\"/home/spoons/diligence/mythx-qa/land/contracts/estate/IEstateRegistry.sol\":{\"keccak256\":\"0xc5cc1a1e1df85bf3bea6aa7ca5be71b663889e359fdefbabc06b7b628e64253f\",\"urls\":[\"bzzr://9899288078da3b7aa25d849f6221868804d6a59420e4974d27178ef616704d61\"]},\"/home/spoons/diligence/mythx-qa/land/contracts/land/LANDStorage.sol\":{\"keccak256\":\"0x3cf37fa9c4d6502cad8cb99fb79f7f055cbce4c450a8f05402f244035fddb2de\",\"urls\":[\"bzzr://a13cb497d1f42bf3eaba058150a71c968d485d1c5714e913c78b2bbc5213a01a\"]},\"/home/spoons/diligence/mythx-qa/land/contracts/upgradable/DelegateProxy.sol\":{\"keccak256\":\"0x92dced6579922638ac06f47c1334e8c30663c88f4f7ed3aaccbf28ce414e5e42\",\"urls\":[\"bzzr://8f7ffff6b5e8db15aad0e9d4fb4b5ad9162ab747f1c46bccc62292c12c675570\"]},\"/home/spoons/diligence/mythx-qa/land/contracts/upgradable/IApplication.sol\":{\"keccak256\":\"0x27c1b7ba3bb102e9e32829befb0724fa8be13567471478ff8a5131e9859c63e8\",\"urls\":[\"bzzr://34ee94ba058fb610db6bcf35d81dc91b31950d58c980c66b1b144bd211a6eef1\"]},\"/home/spoons/diligence/mythx-qa/land/contracts/upgradable/LANDProxy.sol\":{\"keccak256\":\"0x840b7615703088df3b02c15cf5f0caa043a8baac3f0ce62f730e663261788599\",\"urls\":[\"bzzr://40fb3f2d8d2c005e728aae1fcca62e21c85aefe55ec4b887124f2bdc4dd48ae7\"]},\"/home/spoons/diligence/mythx-qa/land/contracts/upgradable/Ownable.sol\":{\"keccak256\":\"0x5f05c306103b6d70d65b2350db3cdfc100baaea881173e2af663e2e8328747f4\",\"urls\":[\"bzzr://808b45e5d101996ceb45497f25b22c697ac2b48b6d8c262533c5ff13b6df9801\"]},\"/home/spoons/diligence/mythx-qa/land/contracts/upgradable/OwnableStorage.sol\":{\"keccak256\":\"0x50b14548efa9b492547cb7d8634a7a0a76046e34cec19f7c4d0fecbea216f175\",\"urls\":[\"bzzr://9934d5482bf5ce553c8015c76a9650645804095e53e104d8a5cd2e09efcda2f2\"]},\"/home/spoons/diligence/mythx-qa/land/contracts/upgradable/Proxy.sol\":{\"keccak256\":\"0xe012e72c93e687834bf761d1dc2f6697cf2b540c38ce1bd6ed16c0aac948ce13\",\"urls\":[\"bzzr://5d264c060e183aa607ab903396242ffa84ff63295a82b8ea9649c2a619e88075\"]},\"/home/spoons/diligence/mythx-qa/land/contracts/upgradable/ProxyStorage.sol\":{\"keccak256\":\"0x45ff896ece4d736ff8c7418df62bb323e4a86dcaaac6df6e77d2ae1eca028a96\",\"urls\":[\"bzzr://51d767dbbfe41a38239e39e998be79efd5e3b8f3207aa2851adc1ebab27f5b69\"]},\"erc821/contracts/AssetRegistryStorage.sol\":{\"keccak256\":\"0xbf8b47bfc7fa01262e2b6cc95bfdff4cc2374a6012feccda9c4b9ede2a4cfcbc\",\"urls\":[\"bzzr://a864731b246010c75056fa8f0be9b386cf9d18b7429757b68dab5d17f045a3bb\"]}},\"version\":1}",
+  "metadata": "{\"compiler\":{\"version\":\"0.4.24+commit.e67f0147\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"constant\":true,\"inputs\":[],\"name\":\"proxyOwner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"},{\"name\":\"\",\"type\":\"address\"}],\"name\":\"updateManager\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"}],\"name\":\"latestPing\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"}],\"name\":\"authorizedDeploy\",\"outputs\":[{\"name\":\"\",\"type\":\"bool\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"currentContract\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"updateOperator\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"newContract\",\"type\":\"address\"},{\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"upgrade\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[],\"name\":\"estateRegistry\",\"outputs\":[{\"name\":\"\",\"type\":\"address\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"payable\":true,\"stateMutability\":\"payable\",\"type\":\"fallback\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"newContract\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"initializedWith\",\"type\":\"bytes\"}],\"name\":\"Upgrade\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"name\":\"_prevOwner\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"OwnerUpdate\",\"type\":\"event\"}],\"devdoc\":{\"methods\":{}},\"userdoc\":{\"methods\":{}}},\"settings\":{\"compilationTarget\":{\"/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/LANDProxy.sol\":\"LANDProxy\"},\"evmVersion\":\"byzantium\",\"libraries\":{},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"/home/spoons/diligence/fuzz-qa/land/contracts/Storage.sol\":{\"keccak256\":\"0x1cd5939d775d44ade927d2e2de4895341eb6e6336738e8654619bb8899f6c095\",\"urls\":[\"bzzr://41cfaeaa792546fd97905ce166f33670fbf0fed545432fe5da7e573131a87f89\"]},\"/home/spoons/diligence/fuzz-qa/land/contracts/estate/IEstateRegistry.sol\":{\"keccak256\":\"0xc5cc1a1e1df85bf3bea6aa7ca5be71b663889e359fdefbabc06b7b628e64253f\",\"urls\":[\"bzzr://9899288078da3b7aa25d849f6221868804d6a59420e4974d27178ef616704d61\"]},\"/home/spoons/diligence/fuzz-qa/land/contracts/land/LANDStorage.sol\":{\"keccak256\":\"0x3cf37fa9c4d6502cad8cb99fb79f7f055cbce4c450a8f05402f244035fddb2de\",\"urls\":[\"bzzr://a13cb497d1f42bf3eaba058150a71c968d485d1c5714e913c78b2bbc5213a01a\"]},\"/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/DelegateProxy.sol\":{\"keccak256\":\"0x92dced6579922638ac06f47c1334e8c30663c88f4f7ed3aaccbf28ce414e5e42\",\"urls\":[\"bzzr://8f7ffff6b5e8db15aad0e9d4fb4b5ad9162ab747f1c46bccc62292c12c675570\"]},\"/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/IApplication.sol\":{\"keccak256\":\"0x27c1b7ba3bb102e9e32829befb0724fa8be13567471478ff8a5131e9859c63e8\",\"urls\":[\"bzzr://34ee94ba058fb610db6bcf35d81dc91b31950d58c980c66b1b144bd211a6eef1\"]},\"/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/LANDProxy.sol\":{\"keccak256\":\"0x840b7615703088df3b02c15cf5f0caa043a8baac3f0ce62f730e663261788599\",\"urls\":[\"bzzr://40fb3f2d8d2c005e728aae1fcca62e21c85aefe55ec4b887124f2bdc4dd48ae7\"]},\"/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/Ownable.sol\":{\"keccak256\":\"0x5f05c306103b6d70d65b2350db3cdfc100baaea881173e2af663e2e8328747f4\",\"urls\":[\"bzzr://808b45e5d101996ceb45497f25b22c697ac2b48b6d8c262533c5ff13b6df9801\"]},\"/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/OwnableStorage.sol\":{\"keccak256\":\"0x50b14548efa9b492547cb7d8634a7a0a76046e34cec19f7c4d0fecbea216f175\",\"urls\":[\"bzzr://9934d5482bf5ce553c8015c76a9650645804095e53e104d8a5cd2e09efcda2f2\"]},\"/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/Proxy.sol\":{\"keccak256\":\"0xe012e72c93e687834bf761d1dc2f6697cf2b540c38ce1bd6ed16c0aac948ce13\",\"urls\":[\"bzzr://5d264c060e183aa607ab903396242ffa84ff63295a82b8ea9649c2a619e88075\"]},\"/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/ProxyStorage.sol\":{\"keccak256\":\"0x45ff896ece4d736ff8c7418df62bb323e4a86dcaaac6df6e77d2ae1eca028a96\",\"urls\":[\"bzzr://51d767dbbfe41a38239e39e998be79efd5e3b8f3207aa2851adc1ebab27f5b69\"]},\"erc821/contracts/AssetRegistryStorage.sol\":{\"keccak256\":\"0xbf8b47bfc7fa01262e2b6cc95bfdff4cc2374a6012feccda9c4b9ede2a4cfcbc\",\"urls\":[\"bzzr://a864731b246010c75056fa8f0be9b386cf9d18b7429757b68dab5d17f045a3bb\"]}},\"version\":1}",
   "bytecode": "0x6080604052600280546001805433600160a060020a0319918216811790925591821681179091161790556107ec806100386000396000f3006080604052600436106100a35763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663025313a2811461017457806307ecec3e146101a55780631e375901146101e057806329ffab3b14610213578063721d7d8e146102345780638da5cb5b146102495780639d40b8501461025e578063c987336c14610276578063e387d31a146102dd578063f2fde38b146102f2575b600054600160a060020a0316151561012b576040805160e560020a62461bcd02815260206004820152602d60248201527f49662061707020636f646520686173206e6f74206265656e207365742079657460448201527f2c20646f206e6f742063616c6c00000000000000000000000000000000000000606482015290519081900360840190fd5b6000805460408051602036601f810182900482028301820190935282825261017294600160a060020a03909416939192908190840183828082843750610313945050505050565b005b34801561018057600080fd5b506101896103c0565b60408051600160a060020a039092168252519081900360200190f35b3480156101b157600080fd5b506101cc600160a060020a03600435811690602435166103cf565b604080519115158252519081900360200190f35b3480156101ec57600080fd5b50610201600160a060020a03600435166103ef565b60408051918252519081900360200190f35b34801561021f57600080fd5b506101cc600160a060020a0360043516610401565b34801561024057600080fd5b50610189610416565b34801561025557600080fd5b50610189610425565b34801561026a57600080fd5b50610189600435610434565b34801561028257600080fd5b5060408051602060046024803582810135601f8101859004850286018501909652858552610172958335600160a060020a031695369560449491939091019190819084018382808284375094975061044f9650505050505050565b3480156102e957600080fd5b50610189610652565b3480156102fe57600080fd5b50610172600160a060020a0360043516610661565b61031c826107b8565b1515610398576040805160e560020a62461bcd02815260206004820152602960248201527f5468652064657374696e6174696f6e2061646472657373206973206e6f74206160448201527f20636f6e74726163740000000000000000000000000000000000000000000000606482015290519081900360840190fd5b600080825160208401856127105a03f43d604051816000823e8280156103bc578282f35b8282fd5b600154600160a060020a031681565b601260209081526000928352604080842090915290825290205460ff1681565b600d6020526000908152604090205481565b60116020526000908152604090205460ff1681565b600054600160a060020a031681565b600254600160a060020a031681565b600f60205260009081526040902054600160a060020a031681565b600154600160a060020a031633146104b1576040805160e560020a62461bcd02815260206004820152601160248201527f556e617574686f72697a65642075736572000000000000000000000000000000604482015290519081900360640190fd5b6000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161781556040517f439fab91000000000000000000000000000000000000000000000000000000008152602060048201818152845160248401528451309463439fab91948794849360449092019290860191908190849084905b8381101561054757818101518382015260200161052f565b50505050905090810190601f1680156105745780820380516001836020036101000a031916815260200191505b5092505050600060405180830381600087803b15801561059357600080fd5b505af11580156105a7573d6000803e3d6000fd5b5050505081600160a060020a03167fe74baeef5988edac1159d9177ca52f0f3d68f624a1996f77467eb3ebfb316537826040518080602001828103825283818151815260200191508051906020019080838360005b838110156106145781810151838201526020016105fc565b50505050905090810190601f1680156106415780820380516001836020036101000a031916815260200191505b509250505060405180910390a25050565b601054600160a060020a031681565b600154600160a060020a031633146106c3576040805160e560020a62461bcd02815260206004820152601160248201527f556e617574686f72697a65642075736572000000000000000000000000000000604482015290519081900360640190fd5b600160a060020a0381161515610723576040805160e560020a62461bcd02815260206004820152600d60248201527f456d707479206164647265737300000000000000000000000000000000000000604482015290519081900360640190fd5b600154600160a060020a0382811691161415610789576040805160e560020a62461bcd02815260206004820152601260248201527f416c726561647920617574686f72697a65640000000000000000000000000000604482015290519081900360640190fd5b6001805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6000903b11905600a165627a7a7230582031a82b6faf1f06ae3f73841c32e6bd5c3a5441a79786bae01040a0d68521a8310029",
   "deployedBytecode": "0x6080604052600436106100a35763ffffffff7c0100000000000000000000000000000000000000000000000000000000600035041663025313a2811461017457806307ecec3e146101a55780631e375901146101e057806329ffab3b14610213578063721d7d8e146102345780638da5cb5b146102495780639d40b8501461025e578063c987336c14610276578063e387d31a146102dd578063f2fde38b146102f2575b600054600160a060020a0316151561012b576040805160e560020a62461bcd02815260206004820152602d60248201527f49662061707020636f646520686173206e6f74206265656e207365742079657460448201527f2c20646f206e6f742063616c6c00000000000000000000000000000000000000606482015290519081900360840190fd5b6000805460408051602036601f810182900482028301820190935282825261017294600160a060020a03909416939192908190840183828082843750610313945050505050565b005b34801561018057600080fd5b506101896103c0565b60408051600160a060020a039092168252519081900360200190f35b3480156101b157600080fd5b506101cc600160a060020a03600435811690602435166103cf565b604080519115158252519081900360200190f35b3480156101ec57600080fd5b50610201600160a060020a03600435166103ef565b60408051918252519081900360200190f35b34801561021f57600080fd5b506101cc600160a060020a0360043516610401565b34801561024057600080fd5b50610189610416565b34801561025557600080fd5b50610189610425565b34801561026a57600080fd5b50610189600435610434565b34801561028257600080fd5b5060408051602060046024803582810135601f8101859004850286018501909652858552610172958335600160a060020a031695369560449491939091019190819084018382808284375094975061044f9650505050505050565b3480156102e957600080fd5b50610189610652565b3480156102fe57600080fd5b50610172600160a060020a0360043516610661565b61031c826107b8565b1515610398576040805160e560020a62461bcd02815260206004820152602960248201527f5468652064657374696e6174696f6e2061646472657373206973206e6f74206160448201527f20636f6e74726163740000000000000000000000000000000000000000000000606482015290519081900360840190fd5b600080825160208401856127105a03f43d604051816000823e8280156103bc578282f35b8282fd5b600154600160a060020a031681565b601260209081526000928352604080842090915290825290205460ff1681565b600d6020526000908152604090205481565b60116020526000908152604090205460ff1681565b600054600160a060020a031681565b600254600160a060020a031681565b600f60205260009081526040902054600160a060020a031681565b600154600160a060020a031633146104b1576040805160e560020a62461bcd02815260206004820152601160248201527f556e617574686f72697a65642075736572000000000000000000000000000000604482015290519081900360640190fd5b6000805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0384161781556040517f439fab91000000000000000000000000000000000000000000000000000000008152602060048201818152845160248401528451309463439fab91948794849360449092019290860191908190849084905b8381101561054757818101518382015260200161052f565b50505050905090810190601f1680156105745780820380516001836020036101000a031916815260200191505b5092505050600060405180830381600087803b15801561059357600080fd5b505af11580156105a7573d6000803e3d6000fd5b5050505081600160a060020a03167fe74baeef5988edac1159d9177ca52f0f3d68f624a1996f77467eb3ebfb316537826040518080602001828103825283818151815260200191508051906020019080838360005b838110156106145781810151838201526020016105fc565b50505050905090810190601f1680156106415780820380516001836020036101000a031916815260200191505b509250505060405180910390a25050565b601054600160a060020a031681565b600154600160a060020a031633146106c3576040805160e560020a62461bcd02815260206004820152601160248201527f556e617574686f72697a65642075736572000000000000000000000000000000604482015290519081900360640190fd5b600160a060020a0381161515610723576040805160e560020a62461bcd02815260206004820152600d60248201527f456d707479206164647265737300000000000000000000000000000000000000604482015290519081900360640190fd5b600154600160a060020a0382811691161415610789576040805160e560020a62461bcd02815260206004820152601260248201527f416c726561647920617574686f72697a65640000000000000000000000000000604482015290519081900360640190fd5b6001805473ffffffffffffffffffffffffffffffffffffffff1916600160a060020a0392909216919091179055565b6000903b11905600a165627a7a7230582031a82b6faf1f06ae3f73841c32e6bd5c3a5441a79786bae01040a0d68521a8310029",
   "sourceMap": "87:40:10:-;;;110:5:12;:18;;;348:23:13;;118:10:12;-1:-1:-1;;;;;;348:23:13;;;;;;;;110:18:12;;;;;377::13;;;;;;87:40:10;;;-1:-1:-1;87:40:10;;",
   "deployedSourceMap": "87:40:10:-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;479:15:13;;-1:-1:-1;;;;;479:15:13;:20;;471:78;;;;;-1:-1:-1;;;;;471:78:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;568:15;;;555:39;;;;585:8;555:39;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;568:15:13;;;;555:39;;585:8;;;555:39;;568:15;585:8;;568:15;555:39;;-1:-1:-1;555:12:13;;-1:-1:-1;;;;;555:39:13:i;:::-;87:40:10;146:25:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;146:25:14;;;;;;;;-1:-1:-1;;;;;146:25:14;;;;;;;;;;;;;;623:65:6;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;623:65:6;-1:-1:-1;;;;;623:65:6;;;;;;;;;;;;;;;;;;;;;;;;;;;;93:43;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;93:43:6;-1:-1:-1;;;;;93:43:6;;;;;;;;;;;;;;;;;;;;;569:49;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;569:49:6;-1:-1:-1;;;;;569:49:6;;;;;112:30:14;;8:9:-1;5:2;;;30:1;27;20:12;5:2;112:30:14;;;;56:20:12;;8:9:-1;5:2;;;30:1;27;20:12;5:2;56:20:12;;;;472:50:6;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;472:50:6;;;;;975:196:13;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;975:196:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;975:196:13;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;975:196:13;;-1:-1:-1;975:196:13;;-1:-1:-1;;;;;;;975:196:13;527:37:6;;8:9:-1;5:2;;;30:1;27;20:12;5:2;527:37:6;;;;731:216:13;;8:9:-1;5:2;;;30:1;27;20:12;5:2;-1:-1;731:216:13;-1:-1:-1;;;;;731:216:13;;;;;304:672:8;380:16;391:4;380:10;:16::i;:::-;372:70;;;;;;;-1:-1:-1;;;;;372:70:8;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;619:1;616;604:9;598:16;591:4;580:9;576:20;570:4;562:5;557:3;553:15;540:81;640:14;679:4;673:11;714:4;711:1;706:3;691:28;895:6;902:28;;;;959:4;954:3;947:17;902:28;923:4;918:3;911:17;146:25:14;;;-1:-1:-1;;;;;146:25:14;;:::o;623:65:6:-;;;;;;;;;;;;;;;;;;;;;;;;;;:::o;93:43::-;;;;;;;;;;;;;:::o;569:49::-;;;;;;;;;;;;;;;:::o;112:30:14:-;;;-1:-1:-1;;;;;112:30:14;;:::o;56:20:12:-;;;-1:-1:-1;;;;;56:20:12;;:::o;472:50:6:-;;;;;;;;;;;;-1:-1:-1;;;;;472:50:6;;:::o;975:196:13:-;683:10;;-1:-1:-1;;;;;683:10:13;669;:24;661:54;;;;;-1:-1:-1;;;;;661:54:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;1058:15;:29;;-1:-1:-1;;1058:29:13;-1:-1:-1;;;;;1058:29:13;;;;;1093:35;;;;;;;;;;;;;;;;;;;;1106:4;;1093:29;;:35;;;;;;;;;;;;;;;;;;;;8:100:-1;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;1093:35:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8:9:-1;5:2;;;30:1;27;20:12;5:2;1093:35:13;;;;8:9:-1;5:2;;;45:16;42:1;39;24:38;77:16;74:1;67:27;5:2;1093:35:13;;;;1148:11;-1:-1:-1;;;;;1140:26:13;;1161:4;1140:26;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;23:1:-1;8:100;33:3;30:1;27:10;8:100;;;90:11;;;84:18;71:11;;;64:39;52:2;45:10;8:100;;;12:14;1140:26:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;975:196;;:::o;527:37:6:-;;;-1:-1:-1;;;;;527:37:6;;:::o;731:216:13:-;683:10;;-1:-1:-1;;;;;683:10:13;669;:24;661:54;;;;;-1:-1:-1;;;;;661:54:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;;;;813:23:13;;;;805:49;;;;;-1:-1:-1;;;;;805:49:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;881:10;;-1:-1:-1;;;;;868:23:13;;;881:10;;868:23;;860:54;;;;;-1:-1:-1;;;;;860:54:13;;;;;;;;;;;;;;;;;;;;;;;;;;;;920:10;:22;;-1:-1:-1;;920:22:13;-1:-1:-1;;;;;920:22:13;;;;;;;;;;731:216::o;980::8:-;1040:4;1149:20;;1183:8;;980:216::o",
   "source": "pragma solidity ^0.4.18;\n\nimport \"../Storage.sol\";\nimport \"../upgradable/Proxy.sol\";\n\n\ncontract LANDProxy is Storage, Proxy {\n}\n",
-  "sourcePath": "/home/spoons/diligence/mythx-qa/land/contracts/upgradable/LANDProxy.sol",
+  "sourcePath": "/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/LANDProxy.sol",
   "ast": {
-    "absolutePath": "/home/spoons/diligence/mythx-qa/land/contracts/upgradable/LANDProxy.sol",
+    "absolutePath": "/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/LANDProxy.sol",
     "exportedSymbols": {
       "LANDProxy": [
         3059
@@ -238,7 +238,7 @@
         "src": "0:24:10"
       },
       {
-        "absolutePath": "/home/spoons/diligence/mythx-qa/land/contracts/Storage.sol",
+        "absolutePath": "/home/spoons/diligence/fuzz-qa/land/contracts/Storage.sol",
         "file": "../Storage.sol",
         "id": 3053,
         "nodeType": "ImportDirective",
@@ -249,7 +249,7 @@
         "unitAlias": ""
       },
       {
-        "absolutePath": "/home/spoons/diligence/mythx-qa/land/contracts/upgradable/Proxy.sol",
+        "absolutePath": "/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/Proxy.sol",
         "file": "../upgradable/Proxy.sol",
         "id": 3054,
         "nodeType": "ImportDirective",
@@ -333,7 +333,7 @@
     "src": "0:128:10"
   },
   "legacyAST": {
-    "absolutePath": "/home/spoons/diligence/mythx-qa/land/contracts/upgradable/LANDProxy.sol",
+    "absolutePath": "/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/LANDProxy.sol",
     "exportedSymbols": {
       "LANDProxy": [
         3059
@@ -354,7 +354,7 @@
         "src": "0:24:10"
       },
       {
-        "absolutePath": "/home/spoons/diligence/mythx-qa/land/contracts/Storage.sol",
+        "absolutePath": "/home/spoons/diligence/fuzz-qa/land/contracts/Storage.sol",
         "file": "../Storage.sol",
         "id": 3053,
         "nodeType": "ImportDirective",
@@ -365,7 +365,7 @@
         "unitAlias": ""
       },
       {
-        "absolutePath": "/home/spoons/diligence/mythx-qa/land/contracts/upgradable/Proxy.sol",
+        "absolutePath": "/home/spoons/diligence/fuzz-qa/land/contracts/upgradable/Proxy.sol",
         "file": "../upgradable/Proxy.sol",
         "id": 3054,
         "nodeType": "ImportDirective",
diff --git a/tests/testdata/version-response.json b/tests/testdata/version-response.json
deleted file mode 100644
index 3ba8370..0000000
--- a/tests/testdata/version-response.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "api": "v1.4.34.4",
-    "maru": "0.5.3",
-    "mythril": "0.21.14",
-    "harvey": "0.0.33",
-    "hash": "6e0035da873e809e90eab4665e3d19d6"
-}
diff --git a/tests/testdata/version-simple.txt b/tests/testdata/version-simple.txt
deleted file mode 100644
index e19ea32..0000000
--- a/tests/testdata/version-simple.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-API: v1.4.34.4
-Harvey: 0.0.33
-Maru: 0.5.3
-Mythril: 0.21.14
-Hashed: 6e0035da873e809e90eab4665e3d19d6
diff --git a/tests/testdata/version-table.txt b/tests/testdata/version-table.txt
deleted file mode 100644
index 56e42c7..0000000
--- a/tests/testdata/version-table.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-╒═════════╤══════════════════════════════════╕
-│ Api     │ v1.4.34.4                        │
-├─────────┼──────────────────────────────────┤
-│ Hash    │ 6e0035da873e809e90eab4665e3d19d6 │
-├─────────┼──────────────────────────────────┤
-│ Harvey  │ 0.0.33                           │
-├─────────┼──────────────────────────────────┤
-│ Maru    │ 0.5.3                            │
-├─────────┼──────────────────────────────────┤
-│ Mythril │ 0.21.14                          │
-╘═════════╧══════════════════════════════════╛