Fixing configs and adding tests.