Low hanging fruit in the tests that fail