Fixing more tests, 11 still failing