more tests passing, still 137 failures