Fix more tests
Add singleton setting mock