Fixed a couple of tests
Simplified the helpers
Fixed the scenario importer, finally