Reduced 73 failing tests to 45.