Fixed tests to work with the new singleton config.js