cleanup
WIP
Merge branch 'develop' into origin/connor/mcda-setup
fix tests
serialize problem as a String
Merge branch 'origin/connor/mcda-setup' into develop
persist the scenario