Failing tests are down to 36.