Fixing more failing tests, simplified ConfigManagerTest