EES-12687, moved config'ing to spaces, fixed tests.