Updating config.
Removing stale tests.
Merge branch 'master' into feature-config