Partially reverting any tests. Let's rather fix any instead of adjusting the tests if it fails.