Fix more tests
Quality violations