Activate more tests and adapt to validate them
Activate more tests