Fix scheduler tests
Fix admin server tests due to changes in single/distributed detection