lets use a dict for environment_data
make sure we switch on the fake docker server during tests
Fix flake8 errors.
Syncing up with `master`.